Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enterprise quote defaultpass #334

Merged
merged 4 commits into from
Jan 19, 2024
+8 −8
Merged

Enterprise quote defaultpass #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5c636e
quote passwords in config file
Btodhunter Jan 18, 2024
5a178fe
bump chart version
Btodhunter Jan 18, 2024
a32b546
update migration instructions to install latest 1.0.x patch release
Btodhunter Jan 18, 2024
fa6951d
update test snapshots
Btodhunter Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/enterprise/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: enterprise
version: "2.2.3"
version: "2.2.4"
appVersion: "5.1.1"
kubeVersion: 1.23.x - 1.28.x || 1.23.x-x - 1.28.x-x
description: |
Expand Down
6 changes: 3 additions & 3 deletions stable/enterprise/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ See the [Migration Rollback Steps](#migration-rollback-steps) section for more d
# export ADMIN_PASS=$(kubectl get secret -n ${NAMESPACE} ${ENGINE_RELEASE}-anchore-engine-admin-pass -o jsonpath="{.data.ANCHORE_ADMIN_PASSWORD}" | base64 -d -)
# export SET_ADMIN_PASS=("--set" "anchoreConfig.default_admin_password=${ADMIN_PASS}")

helm install ${ENTERPRISE_RELEASE} -n ${NAMESPACE} ${SET_ADMIN_PASS[@]} -f ${ENTERPRISE_VALUES_FILE} anchore/enterprise --version=1.0.0
helm install ${ENTERPRISE_RELEASE} -n ${NAMESPACE} ${SET_ADMIN_PASS[@]} -f ${ENTERPRISE_VALUES_FILE} anchore/enterprise --version=^1.0.0
```

1. **Verification and Cleanup**: After confirming that the Anchore Enterprise deployment is functional, you can safely uninstall the old Anchore Engine deployment.
Expand Down Expand Up @@ -840,7 +840,7 @@ See the [Migration Rollback Steps](#migration-rollback-steps) section for more d
export ADMIN_PASS=$(kubectl get secret -n ${NAMESPACE} ${ENGINE_RELEASE}-anchore-engine-admin-pass -o jsonpath="{.data.ANCHORE_ADMIN_PASSWORD}" | base64 -d -)
export SET_ADMIN_PASS=("--set" "anchoreConfig.default_admin_password=${ADMIN_PASS}")

helm install ${ENTERPRISE_RELEASE} -n ${NAMESPACE} --set startMigrationPod=true --set migrationAnchoreEngineSecretName=${ENGINE_RELEASE}-anchore-engine ${SET_ADMIN_PASS[@]} anchore/enterprise -f ${ENTERPRISE_VALUES_FILE} --version=1.0.0
helm install ${ENTERPRISE_RELEASE} -n ${NAMESPACE} --set startMigrationPod=true --set migrationAnchoreEngineSecretName=${ENGINE_RELEASE}-anchore-engine ${SET_ADMIN_PASS[@]} anchore/enterprise -f ${ENTERPRISE_VALUES_FILE} --version=^1.0.0
```

1. **Scale Down Anchore Enterprise**: Before migrating the database, scale down the new Anchore Enterprise deployment to zero replicas.
Expand Down Expand Up @@ -890,7 +890,7 @@ See the [Migration Rollback Steps](#migration-rollback-steps) section for more d
export ENTERPRISE_RELEASE=<YOUR_ENTERPRISE_RELEASE_NAME>
export ENTERPRISE_VALUES_FILE=${PWD}/output/enterprise.my-values-file.yaml # The converted file

helm upgrade ${ENTERPRISE_RELEASE} -n ${NAMESPACE} --set startMigrationPod=false anchore/enterprise -f ${ENTERPRISE_VALUES_FILE} --version=1.0.0
helm upgrade ${ENTERPRISE_RELEASE} -n ${NAMESPACE} --set startMigrationPod=false anchore/enterprise -f ${ENTERPRISE_VALUES_FILE} --version=^1.0.0
```

1. **Final Verification and Cleanup**: After ensuring the new deployment is operational, uninstall the old Anchore Engine deployment.
Expand Down
4 changes: 2 additions & 2 deletions stable/enterprise/files/default_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ metrics:

webhooks: {{- toYaml .Values.anchoreConfig.webhooks | nindent 2 }}

default_admin_password: ${ANCHORE_ADMIN_PASSWORD}
default_admin_password: "${ANCHORE_ADMIN_PASSWORD}"
default_admin_email: ${ANCHORE_ADMIN_EMAIL}

keys:
secret: ${ANCHORE_SAML_SECRET}
secret: "${ANCHORE_SAML_SECRET}"
public_key_path: ${ANCHORE_AUTH_PRIVKEY}
private_key_path: ${ANCHORE_AUTH_PUBKEY}

Expand Down
4 changes: 2 additions & 2 deletions stable/enterprise/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ should render the configmaps:
webhooks:
{}

default_admin_password: ${ANCHORE_ADMIN_PASSWORD}
default_admin_password: "${ANCHORE_ADMIN_PASSWORD}"
default_admin_email: ${ANCHORE_ADMIN_EMAIL}

keys:
secret: ${ANCHORE_SAML_SECRET}
secret: "${ANCHORE_SAML_SECRET}"
public_key_path: ${ANCHORE_AUTH_PRIVKEY}
private_key_path: ${ANCHORE_AUTH_PUBKEY}

Expand Down
Loading