Skip to content

admin: Install redis-operator through cluster-config

Antoine R. Dumont requested to merge mr/align-redis into production

This used to be installed by the k8s-cluster-config repository.

This now installs it through the cluster-configuration chart. This aligns the installation of (various) operators (including redis) in the other clusters (local-cluster, test-staging, staging, next-version, ...).

helm diff
[cluster-configuration] Comparing changes between branches production and mr/align-redis...
Your branch is up to date with 'origin/production'.
[cluster-configuration] Generate config in production branch for cluster-configuration/values/admin-rke2.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/archive-production-rke2.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/archive-staging-rke2.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/gitlab-production.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/gitlab-staging.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/local-cluster.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/rancher.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/test-staging-rke2.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/admin-rke2.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/archive-production-rke2.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/archive-staging-rke2.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/gitlab-production.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/gitlab-staging.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/local-cluster.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/rancher.yaml...
[cluster-configuration] Generate config in mr/align-redis branch for cluster-configuration/values/test-staging-rke2.yaml...


------------- diff for cluster-configuration/values/admin-rke2.yaml -------------

--- /tmp/swh-chart.cluster-configuration.Wmp9QisX/admin-rke2.yaml.before	2024-10-22 10:45:01.806714349 +0200
+++ /tmp/swh-chart.cluster-configuration.Wmp9QisX/admin-rke2.yaml.after	2024-10-22 10:45:02.102714355 +0200
@@ -213,10 +213,37 @@
       selfHeal: false
       allowEmpty: false
     syncOptions:
     - RespectIgnoreDifferences=true
   ignoreDifferences:
   # The ca bundle is updated by the controller during the runtime
   - group: 'apiextensions.k8s.io'
     kind: 'CustomResourceDefinition'
     jsonPointers:
     - /spec/conversion/webhook/clientConfig/caBundle
+---
+# Source: Argocd applications commonly used in to configure a SWH cluster/templates/redis/operator.yaml
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cc-admin-rke2-redis-operator
+  namespace: argocd
+spec:
+  revisionHistoryLimit: 2
+  project: default
+  source:
+    chart: redis-operator
+    repoURL: https://ot-container-kit.github.io/helm-charts/
+    targetRevision: 0.15.10
+    helm:
+      # must match the application name (https://github.com/argoproj/argo-cd/issues/2871)
+      releaseName: cc-admin-rke2-redis-operator
+
+  destination:
+    server: https://rancher.euwest.azure.internal.softwareheritage.org/k8s/clusters/c-m-682nvssh
+    namespace: "redis"
+  syncPolicy:
+    automated:
+      prune: false
+      selfHeal: false
+    syncOptions:
+    - ServerSideApply=true


------------- diff for cluster-configuration/values/archive-production-rke2.yaml -------------

No differences


------------- diff for cluster-configuration/values/archive-staging-rke2.yaml -------------

No differences


------------- diff for cluster-configuration/values/gitlab-production.yaml -------------

No differences


------------- diff for cluster-configuration/values/gitlab-staging.yaml -------------

No differences


------------- diff for cluster-configuration/values/local-cluster.yaml -------------

No differences


------------- diff for cluster-configuration/values/rancher.yaml -------------

No differences


------------- diff for cluster-configuration/values/test-staging-rke2.yaml -------------

No differences

Refs. swh/infra/sysadm-environment#5462 (closed)

Edited by Antoine R. Dumont

Merge request reports