[swh] Comparing changes between branches staging and mr/deploy-alter (per environment)... Your branch is up to date with 'origin/staging'. [swh] Generate config in staging branch for environment staging, namespace swh... [swh] Generate config in staging branch for environment staging, namespace swh-cassandra... [swh] Generate config in staging branch for environment staging, namespace swh-cassandra-next-version... Your branch is up to date with 'origin/mr/deploy-alter'. [swh] Generate config in mr/deploy-alter branch for environment staging... [swh] Generate config in mr/deploy-alter branch for environment staging... [swh] Generate config in mr/deploy-alter branch for environment staging... Your branch is up to date with 'origin/staging'. [swh] Generate config in staging branch for environment production, namespace swh... [swh] Generate config in staging branch for environment production, namespace swh-cassandra... [swh] Generate config in staging branch for environment production, namespace swh-cassandra-next-version... Your branch is up to date with 'origin/mr/deploy-alter'. [swh] Generate config in mr/deploy-alter branch for environment production... [swh] Generate config in mr/deploy-alter branch for environment production... [swh] Generate config in mr/deploy-alter branch for environment production... ------------- diff for environment staging namespace swh ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.fgp2VVDE/staging-swh.before, 113 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.fgp2VVDE/staging-swh.after, 113 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/ ------------- diff for environment staging namespace swh-cassandra ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.fgp2VVDE/staging-swh-cassandra.before, 391 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.fgp2VVDE/staging-swh-cassandra.after, 394 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned one difference |___/ (file level) --- # Source: swh/templates/alter/configmap.yaml apiVersion: v1 kind: ConfigMap metadata: │ name: alter-template │ namespace: swh-cassandra data: │ config.yml.template: | │ │ graph: │ │ timeout: null │ │ url: http://graph.internal.softwareheritage.org:5009/graph │ │ recovery_bundles: │ │ secret_sharing: │ │ groups: │ │ legal: │ │ minimum_required_shares: 1 │ │ recipient_keys: │ │ Ali: age123hpq9m25xsmx7caqvyv8k3fxaqastc3evyq9q7myur7l9ukj4dsnp7a5v │ │ Bob: age1mrhte5tlpzpz57gg85nzcefqc5pm5usmakqpuurxux7ry2rmhdgs7r9u68 │ │ sysadmins: │ │ minimum_required_shares: 1 │ │ recipient_keys: │ │ Camille: age1ahuqxgjmvfm65shmwqa7xa703vvcla528swga3zempnxslj3pczqtx6wr8 │ │ Dlique: age1qwu50kncctmpky7gg5s0v4mt4fzc4wjwj6mfjzhtk3wn6pspkyksmsmhze │ │ minimum_required_groups: 2 │ │ removal_journals: │ │ journal: │ │ anonymize: true │ │ brokers: │ │ - journal2.internal.staging.swh.network │ │ client_id: swh.storage-cassandra.journal_writer.${HOSTNAME} │ │ cls: kafka │ │ prefix: swh.journal.objects │ │ producer_config: │ │ message.max.bytes: 1000000000 │ │ removal_objstorages: │ │ db1: │ │ cls: remote │ │ url: http://objstorage-db1-delete-rpc-ingress │ │ storage1: │ │ cls: remote │ │ url: http://objstorage-storage1-delete-rpc-ingress │ │ removal_searches: │ │ search: │ │ cls: remote │ │ url: http://search-rpc-ingress │ │ removal_storages: │ │ cassandra: │ │ auth_provider: │ │ cls: cassandra.auth.PlainTextAuthProvider │ │ password: ${CASSANDRA_PASSWORD} │ │ username: swh-rw │ │ cls: cassandra │ │ consistency_level: LOCAL_QUORUM │ │ directory_entries_insert_algo: batch │ │ hosts: │ │ - cassandra1.internal.staging.swh.network │ │ - cassandra2.internal.staging.swh.network │ │ - cassandra3.internal.staging.swh.network │ │ keyspace: swh │ │ objstorage: │ │ cls: noop │ │ postgresql: │ │ cls: postgresql │ │ db: host=db1.internal.staging.swh.network port=5432 user=swh dbname=swh password=${POSTGRESQL_PASSWORD} │ │ objstorage: │ │ cls: noop │ │ restoration_storage: │ │ cls: pipeline │ │ steps: │ │ - cls: buffer │ │ min_batch_size: │ │ content: 100 │ │ content_bytes: 52428800 │ │ directory: 100 │ │ directory_entries: 500 │ │ extid: 100 │ │ release: 100 │ │ release_bytes: 52428800 │ │ revision: 100 │ │ revision_bytes: 52428800 │ │ revision_parents: 200 │ │ - cls: filter │ │ - cls: retry │ │ - cls: remote │ │ url: http://storage-cassandra-read-write-ingress │ │ storage: │ │ cls: postgresql │ │ db: host=db1.internal.staging.swh.network port=5432 user=swh dbname=swh password=${POSTGRESQL_PASSWORD} │ │ objstorage: │ │ cls: remote │ │ url: http://objstorage-read-only-rpc-ingress │ │ # Source: swh/templates/alter/deployment.yaml apiVersion: v1 kind: PersistentVolumeClaim metadata: │ name: alter-recovery-bundles-pvc │ namespace: swh-cassandra spec: │ storageClassName: cephfs │ accessModes: │ - ReadWriteMany │ volumeMode: Filesystem │ resources: │ │ requests: │ │ │ storage: 30Gi # Source: swh/templates/alter/deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: │ labels: │ │ app: alter │ name: alter │ namespace: swh-cassandra spec: │ replicas: 1 │ selector: │ │ matchLabels: │ │ │ app: alter │ strategy: │ │ type: RollingUpdate │ │ rollingUpdate: │ │ │ maxSurge: 1 │ template: │ │ metadata: │ │ │ labels: │ │ │ │ app: alter │ │ │ annotations: │ │ │ │ # Force a rollout upgrade if the configuration changes checksum/config: 038008577fab461b6b2640595be8f10bf4bfbfffd2b0201559df919667f1ed01 │ │ spec: │ │ │ securityContext: │ │ │ │ fsGroup: 1000 │ │ │ affinity: │ │ │ │ nodeAffinity: │ │ │ │ │ requiredDuringSchedulingIgnoredDuringExecution: │ │ │ │ │ │ nodeSelectorTerms: │ │ │ │ │ │ - matchExpressions: │ │ │ │ │ │ │ - key: swh/alter │ │ │ │ │ │ │ │ operator: In │ │ │ │ │ │ │ │ values: │ │ │ │ │ │ │ │ - "true" │ │ │ priorityClassName: │ │ │ initContainers: │ │ │ - name: prepare-configuration │ │ │ │ image: "container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1" │ │ │ │ imagePullPolicy: IfNotPresent │ │ │ │ env: │ │ │ │ - name: CASSANDRA_PASSWORD │ │ │ │ │ valueFrom: │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ key: cassandra-swh-rw-password │ │ │ │ │ │ │ name: common-secrets │ │ │ │ │ │ │ optional: false │ │ │ │ - name: POSTGRESQL_PASSWORD │ │ │ │ │ valueFrom: │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ key: postgres-swh-password │ │ │ │ │ │ │ name: swh-postgresql-common-secret │ │ │ │ │ │ │ optional: false │ │ │ │ command: │ │ │ │ - /entrypoints/prepare-configuration.sh │ │ │ │ volumeMounts: │ │ │ │ - name: config-utils │ │ │ │ │ mountPath: /entrypoints │ │ │ │ │ readOnly: true │ │ │ │ - name: configuration │ │ │ │ │ mountPath: /etc/swh │ │ │ │ - name: configuration-template │ │ │ │ │ mountPath: /etc/swh/configuration-template │ │ │ containers: │ │ │ - name: alter │ │ │ │ resources: │ │ │ │ │ requests: │ │ │ │ │ │ memory: 512Mi │ │ │ │ │ │ cpu: 500m │ │ │ │ command: │ │ │ │ - /opt/swh/entrypoint.sh │ │ │ │ image: "container-registry.softwareheritage.org/swh/infra/swh-apps/alter:20240606.2" │ │ │ │ imagePullPolicy: IfNotPresent │ │ │ │ env: │ │ │ │ - name: SWH_LOG_LEVEL │ │ │ │ │ value: INFO │ │ │ │ - name: SWH_CONFIG_FILENAME │ │ │ │ │ value: /etc/swh/config.yml │ │ │ │ - name: HISTFILE │ │ │ │ │ value: /srv/recovery-bundles/.bash_history │ │ │ │ volumeMounts: │ │ │ │ - name: configuration │ │ │ │ │ mountPath: /etc/swh │ │ │ │ - name: alter-recovery-bundle-volumes │ │ │ │ │ mountPath: /srv/recovery-bundles │ │ │ │ │ readOnly: false │ │ │ volumes: │ │ │ - name: configuration │ │ │ │ emptyDir: {} │ │ │ - name: configuration-template │ │ │ │ configMap: │ │ │ │ │ name: alter-template │ │ │ │ │ defaultMode: 0777 │ │ │ │ │ items: │ │ │ │ │ - key: config.yml.template │ │ │ │ │ │ path: config.yml.template │ │ │ - name: config-utils │ │ │ │ configMap: │ │ │ │ │ name: config-utils │ │ │ │ │ defaultMode: 0555 │ │ │ - name: alter-recovery-bundle-volumes │ │ │ │ persistentVolumeClaim: │ │ │ │ │ claimName: alter-recovery-bundles-pvc ------------- diff for environment staging namespace swh-cassandra-next-version ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.fgp2VVDE/staging-swh-cassandra-next-version.before, 149 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.fgp2VVDE/staging-swh-cassandra-next-version.after, 149 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/ ------------- diff for environment production namespace swh ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.fgp2VVDE/production-swh.before, 411 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.fgp2VVDE/production-swh.after, 411 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/ ------------- diff for environment production namespace swh-cassandra ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.fgp2VVDE/production-swh-cassandra.before, 94 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.fgp2VVDE/production-swh-cassandra.after, 94 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/