Migrate staging to dedicated namespace.

charts/openvsx/templates/redis-cluster-operator/deployment.yaml

@@ -11,17 +11,17 @@ spec:
     matchLabels:
       app: {{ .Values.name }}
       environment: {{ .Values.environment }}
-      component: redis-cluster-operator
+      component: redis-cluster-operator-{{ .Values.environment }}
   template:
     metadata:
       labels:
         app: {{ .Values.name }}
         environment: {{ .Values.environment }}
-        component: redis-cluster-operator
+        component: redis-cluster-operator-{{ .Values.environment }}
     spec:
       serviceAccountName: {{ .Values.redis.serviceAccountName }}
       containers:
-      - name: redis-cluster-operator
+      - name: redis-cluster-operator-{{ .Values.environment }}
         image: "ghcr.io/eclipsefdn/redis-cluster-operator"
         imagePullPolicy: Always
         env:

charts/openvsx/templates/redis-cluster-operator/rbac.yaml

@@ -7,7 +7,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: redis-cluster-operator-role-cluster
+  name: {{ .Values.redis.clusterRoleName }}
 rules:
   # Kopf: runtime observation of namespaces & CRDs (addition/deletion).
   - apiGroups: [apiextensions.k8s.io]
@@ -23,11 +23,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: redis-cluster-operator-role-binding-cluster
+  name: {{ .Values.redis.clusterRoleBindingName }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: redis-cluster-operator-role-cluster
+  name: {{ .Values.redis.clusterRoleName }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.redis.serviceAccountName }}
@@ -37,7 +37,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   namespace: {{ .Values.namespace }}
-  name: redis-cluster-operator-role
+  name: {{ .Values.redis.clusterRoleName }}
 rules:
   # Kopf: knowing which other operators are running (i.e. peering).
   - apiGroups: [open-vsx.org]
@@ -75,11 +75,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   namespace: {{ .Values.namespace }}
-  name: redis-cluster-operator-role-binding
+  name: {{ .Values.redis.clusterRoleBinding }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: redis-cluster-operator-role
+  name: {{ .Values.redis.clusterRoleName }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.redis.serviceAccountName }}

charts/openvsx/values-staging.yaml

@@ -2,7 +2,7 @@
 
 name: &name open-vsx-org
 environment: &environment staging
-namespace: &namespace open-vsx-org
+namespace: &namespace open-vsx-org-staging
 host: staging.open-vsx.org
 
 replicaCount: 1
@@ -65,6 +65,10 @@ redis:
     storageGi: 1
     storageClass: cephfs-new
   serviceAccountName: redis-cluster-operator-staging
+  clusterRoleName: redis-cluster-operator-role-cluster-staging
+  clusterRoleBindingName:  redis-cluster-operator-role-binding-cluster-staging
+  clusterRoleName: redis-cluster-operator-role-staging
+  clusterRoleBinding: redis-cluster-operator-role-binding-staging
 
 # grafana alloy
 alloy:

charts/openvsx/values.yaml

@@ -64,7 +64,11 @@ redis:
   persistence:
     storageGi: 5
     storageClass: cephfs-new
-  serviceAccountName: redis-cluster-operator-production
+  serviceAccountName: redis-cluster-operator
+  clusterRoleName: redis-cluster-operator-role-cluster
+  clusterRoleBindingName:  redis-cluster-operator-role-binding-cluster
+  clusterRoleName: redis-cluster-operator-role
+  clusterRoleBinding: redis-cluster-operator-role-binding
 
 # grafana alloy
 alloy:

kubernetes/helm-deploy.sh

@@ -21,6 +21,7 @@ release_name_staging="staging"
 release_name_production="production"
 chart_name="openvsx"
 namespace="open-vsx-org"
+namespace_staging="open-vsx-org-staging"
 
 environment="${1:-}"
 image_tag="${2:-}"
@@ -40,6 +41,7 @@ fi
 if [[ "${environment}" == "staging" ]]; then
   values_file="${ROOT_DIR}/charts/${chart_name}/values-staging.yaml"
   release_name="${release_name_staging}"
+  namespace="${namespace_staging}"
 elif [[ "${environment}" == "production" ]]; then
   values_file="${ROOT_DIR}/charts/${chart_name}/values.yaml"
   release_name="${release_name_production}"