[swh] Comparing changes between branches mr/dry-secrets and mr/masking-admin (per environment)... Your branch is up to date with 'origin/mr/dry-secrets'. [swh] Generate config in mr/dry-secrets branch for environment staging, namespace swh... [swh] Generate config in mr/dry-secrets branch for environment staging, namespace swh-cassandra... [swh] Generate config in mr/dry-secrets branch for environment staging, namespace swh-cassandra-next-version... Your branch is up to date with 'origin/mr/masking-admin'. [swh] Generate config in mr/masking-admin branch for environment staging... [swh] Generate config in mr/masking-admin branch for environment staging... [swh] Generate config in mr/masking-admin branch for environment staging... Your branch is up to date with 'origin/mr/dry-secrets'. [swh] Generate config in mr/dry-secrets branch for environment production, namespace swh... [swh] Generate config in mr/dry-secrets branch for environment production, namespace swh-cassandra... [swh] Generate config in mr/dry-secrets branch for environment production, namespace swh-cassandra-next-version... Your branch is up to date with 'origin/mr/masking-admin'. [swh] Generate config in mr/masking-admin branch for environment production... [swh] Generate config in mr/masking-admin branch for environment production... [swh] Generate config in mr/masking-admin branch for environment production... ------------- diff for environment staging namespace swh ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.EvfAYR9Y/staging-swh.before, 111 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.EvfAYR9Y/staging-swh.after, 111 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned three differences |___/ data.config.yml.template (v1/ConfigMap/swh/storage-postgresql-read-only-configuration-template) ± value change in multiline text (one insert, one deletion) - - cls: retry + - cls: masking + masking_db: host=db1.internal.staging.swh.network port=5432 user=guest dbname=swh-masking + password=${MASKING_GUEST_PGPASSWORD} spec.template.metadata.annotations.checksum/config (apps/v1/Deployment/swh/storage-postgresql-read-only) ± value change - 33fd736bda9935aa17b76cf03e0709a7d1a716bfb0fb8c22dacedbea20aa543e + 6af52166b9f1e49fbd071779062391bfced2a4756536ec9f022d05a49175b758 spec.template.spec.initContainers.prepare-configuration.env (apps/v1/Deployment/swh/storage-postgresql-read-only) + one list entry added: - name: MASKING_GUEST_PGPASSWORD │ valueFrom: │ │ secretKeyRef: │ │ │ name: swh-postgresql-common-secret │ │ │ key: postgres-guest-password │ │ │ optional: false ------------- diff for environment staging namespace swh-cassandra ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.EvfAYR9Y/staging-swh-cassandra.before, 360 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.EvfAYR9Y/staging-swh-cassandra.after, 361 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned nine differences |___/ (file level) --- # Source: swh/templates/toolbox/configmap.yaml apiVersion: v1 kind: ConfigMap metadata: │ name: toolbox-masking-template │ namespace: swh-cassandra data: │ config.yml.template: | │ │ storage: │ │ cls: postgresql │ │ db: host=db1.internal.staging.swh.network port=5432 user=swh-masking dbname=swh-masking │ │ password=${MASKING_ADMIN_PGPASSWORD} │ │ masking_admin: │ │ masking_db: host=db1.internal.staging.swh.network port=5432 user=swh-masking dbname=swh-masking │ │ password=${MASKING_ADMIN_PGPASSWORD} │ │ data.config.yml.template (v1/ConfigMap/swh-cassandra/storage-cassandra-read-only-configuration-template) ± value change in multiline text (one insert, one deletion) - auth_provider: - cls: cassandra.auth.PlainTextAuthProvider - password: ${CASSANDRA_PASSWORD} - username: swh-ro - cls: cassandra - consistency_level: LOCAL_QUORUM - hosts: - - cassandra1.internal.staging.swh.network - - cassandra2.internal.staging.swh.network - - cassandra3.internal.staging.swh.network - keyspace: swh - objstorage: - cls: remote - url: http://objstorage-read-only-rpc-ingress + cls: pipeline + steps: + - cls: masking + masking_db: host=db1.internal.staging.swh.network port=5432 user=guest dbname=swh-masking + password=${MASKING_GUEST_PGPASSWORD} + - auth_provider: + cls: cassandra.auth.PlainTextAuthProvider + password: ${CASSANDRA_PASSWORD} + username: swh-ro + cls: cassandra + consistency_level: LOCAL_QUORUM + hosts: + - cassandra1.internal.staging.swh.network + - cassandra2.internal.staging.swh.network + - cassandra3.internal.staging.swh.network + keyspace: swh + objstorage: + cls: remote + url: http://objstorage-read-only-rpc-ingress data (v1/ConfigMap/swh-cassandra/toolbox-script-utils) + two map entries added: check-masking-db-version.sh: | │ #!/bin/bash │ │ set -eu │ │ exec /opt/swh/bin/check-db-version.sh storage /etc/swh/config-masking.yml storage │ migrate-masking-db-version.sh: | │ #!/bin/bash │ │ set -eu │ │ exec /opt/swh/bin/migrate-db-version.sh storage /etc/swh/config-masking.yml storage │ spec.template.metadata.annotations.checksum/config (apps/v1/Deployment/swh-cassandra/storage-cassandra-read-only) ± value change - 065711e0d402a3a6c03ab4b9a955f75069b7cb6d4dd6db54ba500cc81fd5c062 + b8ae6c11c13cc089647c79d7aa97da386b54caecad2d2fcc14fee329f7e9a33c spec.template.spec.initContainers.prepare-configuration.env (apps/v1/Deployment/swh-cassandra/storage-cassandra-read-only) + one list entry added: - name: MASKING_GUEST_PGPASSWORD │ valueFrom: │ │ secretKeyRef: │ │ │ name: swh-postgresql-common-secret │ │ │ key: postgres-guest-password │ │ │ optional: false spec.template.metadata.annotations.checksum/config (apps/v1/Deployment/swh-cassandra/swh-toolbox) ± value change - 13e3e922e0047d68e91df2e4184b7c372247116d52b49a6bcf8e6c089663aa65 + add10c6433efe5f60151f5c91c28cc741ebbfdbf627f7fe210d1d9e44e6b1210 spec.template.metadata.annotations.checksum/configScript (apps/v1/Deployment/swh-cassandra/swh-toolbox) ± value change - ac6ee536c8e0fc712036a0f9b01dca9d0aec5289436804e6dcdf7a4dcf548de3 + f6e562f44e0193007fe9fc7965d8b2289b35bf970cbedebb90745d3d9ea244f3 spec.template.spec.initContainers (apps/v1/Deployment/swh-cassandra/swh-toolbox) + one list entry added: - name: prepare-configuration-masking │ image: "debian:bullseye" │ imagePullPolicy: IfNotPresent │ command: │ - /bin/bash │ args: │ - "-c" │ - "eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config-masking.yml" │ volumeMounts: │ - name: configuration │ │ mountPath: /etc/swh │ - name: configuration-masking-template │ │ mountPath: /etc/swh/configuration-template │ env: │ - name: MASKING_ADMIN_PGPASSWORD │ │ valueFrom: │ │ │ secretKeyRef: │ │ │ │ name: swh-postgresql-masking-secret │ │ │ │ key: postgres-swh-masking-password │ │ │ │ optional: false spec.template.spec.volumes (apps/v1/Deployment/swh-cassandra/swh-toolbox) + one list entry added: - name: configuration-masking-template │ configMap: │ │ name: toolbox-masking-template │ │ defaultMode: 0777 │ │ items: │ │ - key: config.yml.template │ │ │ path: config.yml.template ------------- diff for environment staging namespace swh-cassandra-next-version ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.EvfAYR9Y/staging-swh-cassandra-next-version.before, 130 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.EvfAYR9Y/staging-swh-cassandra-next-version.after, 130 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/ ------------- diff for environment production namespace swh ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.EvfAYR9Y/production-swh.before, 399 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.EvfAYR9Y/production-swh.after, 399 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/ ------------- diff for environment production namespace swh-cassandra ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.EvfAYR9Y/production-swh-cassandra.before, 109 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.EvfAYR9Y/production-swh-cassandra.after, 109 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/