diff --git a/ansible/inventory/demo/host.yml b/ansible/inventory/demo/host.yml index 0caa01901..e1274101a 100644 --- a/ansible/inventory/demo/host.yml +++ b/ansible/inventory/demo/host.yml @@ -57,7 +57,6 @@ wiab: - databases-ephemeral - postgresql - reaper - - smallstep-accomp - wire-server - webapp - account-pages diff --git a/bin/helm-operations.sh b/bin/helm-operations.sh index 30b645d80..10c57fed2 100755 --- a/bin/helm-operations.sh +++ b/bin/helm-operations.sh @@ -60,7 +60,7 @@ process_values() { ENV=$1 TYPE=$2 - charts=(fake-aws smtp rabbitmq databases-ephemeral reaper wire-server webapp account-pages team-settings smallstep-accomp ingress-nginx-controller nginx-ingress-services coturn sftd cert-manager) + charts=(fake-aws smtp rabbitmq databases-ephemeral reaper wire-server webapp account-pages team-settings ingress-nginx-controller nginx-ingress-services coturn sftd cert-manager) if [[ "$ENV" != "prod" ]] || [[ -z "$TYPE" ]] ; then echo "Error: This function only supports prod deployments with TYPE as values or secrets. ENV must be 'prod', got: '$ENV' and '$TYPE'" @@ -214,7 +214,7 @@ sync_pg_secrets configure_values # deploying with external datastores, useful for prod setup -deploy_charts cassandra-external elasticsearch-external minio-external postgresql-external fake-aws smtp rabbitmq-external databases-ephemeral reaper wire-server webapp account-pages team-settings smallstep-accomp ingress-nginx-controller +deploy_charts cassandra-external elasticsearch-external minio-external postgresql-external fake-aws smtp rabbitmq-external databases-ephemeral reaper wire-server webapp account-pages team-settings ingress-nginx-controller # deploying cert-manager only when the env var DEPLOY_CERT_MANAGER is set to TRUE if [[ "$DEPLOY_CERT_MANAGER" == "TRUE" ]]; then diff --git a/changelog.d/3-deploy-builds/disable-smallstep b/changelog.d/3-deploy-builds/disable-smallstep new file mode 100644 index 000000000..2f3741837 --- /dev/null +++ b/changelog.d/3-deploy-builds/disable-smallstep @@ -0,0 +1 @@ +Fixed: stop deploying smallstep in wiab-staging and wiab-dev environments diff --git a/offline/wiab-staging.md b/offline/wiab-staging.md index 53b7cef31..aa89e87b0 100644 --- a/offline/wiab-staging.md +++ b/offline/wiab-staging.md @@ -194,7 +194,7 @@ d sh -c 'TARGET_SYSTEM="example.dev" CERT_MASTER_EMAIL="certmaster@example.dev" **Charts deployed by the script:** - External datastores and helpers: `cassandra-external`, `elasticsearch-external`, `minio-external`, `rabbitmq-external`,`postgresql-external`, `databases-ephemeral`, `reaper`, `fake-aws`, `demo-smtp`. -- Wire services: `wire-server`, `webapp`, `account-pages`, `team-settings`, `smallstep-accomp`. +- Wire services: `wire-server`, `webapp`, `account-pages`, `team-settings`. - Ingress and certificates: `ingress-nginx-controller`, `cert-manager`, `nginx-ingress-services`. - Calling services: `sftd`, `coturn`. @@ -424,7 +424,6 @@ For additional background on when hairpin NAT is required and how it relates to - **[Deploying webapp](docs_ubuntu_22.04.md#deploying-webapp)**: Read more about webapp deployment and domain configuration. - **[Deploying team-settings](docs_ubuntu_22.04.md#deploying-team-settings)**: Read more about team settings services. - **[Deploying account-pages](docs_ubuntu_22.04.md#deploying-account-pages)**: Read more about account management services. -- **[Deploying smallstep-accomp](docs_ubuntu_22.04.md#deploying-smallstep-accomp)**: Read more about the ACME companion. - **[Enabling emails for wire](smtp.md)**: Read more about SMTP options for onboarding email delivery and relay setup. - **[Deploy ingress-nginx-controller](docs_ubuntu_22.04.md#deploy-ingress-nginx-controller)**: Read more about ingress configuration and traffic forwarding requirements. - **[Acquiring / Deploying SSL Certificates](docs_ubuntu_22.04.md#acquiring--deploying-ssl-certificates)**: Read more about TLS options (Bring Your Own or cert-manager) and certificate requirements.