ci: fix helm chart issues

dana-team · Aug 20, 2024 · 18a4957 · 18a4957
1 parent ab38e83
commit 18a4957
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 27 deletions.
diff --git a/charts/rcs-ocm-addons/templates/score-addon/addon-clusterrole.yaml b/charts/rcs-ocm-addons/templates/score-addon/addon-clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "rcs-ocm-addons.fullname" . }}-addon
+  name: {{ include "rcs-ocm-addons.fullname" . }}-score-addon
   labels:
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
 rules:

diff --git a/charts/rcs-ocm-addons/templates/score-addon/addon-clusterrolebinding.yaml b/charts/rcs-ocm-addons/templates/score-addon/addon-clusterrolebinding.yaml
@@ -1,14 +1,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "rcs-ocm-addons.fullname" . }}-addon
+  name: {{ include "rcs-ocm-addons.fullname" . }}-score-addon
   labels:
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "rcs-ocm-addons.fullname" . }}-addon
+  name: {{ include "rcs-ocm-addons.fullname" . }}-score-addon
 subjects:
 - kind: ServiceAccount
-  name: {{ include "rcs-ocm-addons.fullname" . }}-addon-sa
+  name: {{ include "rcs-ocm-addons.fullname" . }}-score-addon-sa
   namespace: {{ .Release.Namespace }}
diff --git a/charts/rcs-ocm-addons/templates/score-addon/cluster-management-addon.yaml b/charts/rcs-ocm-addons/templates/score-addon/cluster-management-addon.yaml
@@ -1,7 +1,7 @@
 apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
-  name: {{ include "rcs-ocm-addons.fullname" . }}-rcs-score
+  name: rcs-score
   labels:
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
   annotations:

diff --git a/charts/rcs-ocm-addons/templates/score-addon/deployment.yaml b/charts/rcs-ocm-addons/templates/score-addon/deployment.yaml
@@ -3,18 +3,18 @@ kind: Deployment
 metadata:
   name: {{ include "rcs-ocm-addons.fullname" . }}-score-addon-manager
   labels:
-    app: rcs-score-addon-manager
+    app: {{ include "rcs-ocm-addons.fullname" . }}-score-addon-manager
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: rcs-score-addon-manager
+      app: {{ include "rcs-ocm-addons.fullname" . }}-score-addon-manager
     {{- include "rcs-ocm-addons.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: rcs-score-addon-manager
+        app: {{ include "rcs-ocm-addons.fullname" . }}-score-addon-manager
       {{- include "rcs-ocm-addons.selectorLabels" . | nindent 8 }}
     spec:
       securityContext:
@@ -49,4 +49,4 @@ spec:
         env:
         - name: ADDON_IMAGE
           value: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
-      serviceAccountName: {{ include "rcs-ocm-addons.fullname" . }}-addon-sa
+      serviceAccountName: {{ include "rcs-ocm-addons.fullname" . }}-score-addon-sa
diff --git a/charts/rcs-ocm-addons/templates/score-addon/serviceaccount.yaml b/charts/rcs-ocm-addons/templates/score-addon/serviceaccount.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "rcs-ocm-addons.fullname" . }}-addon-sa
+  name: {{ include "rcs-ocm-addons.fullname" . }}-score-addon-sa
   labels:
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
diff --git a/charts/rcs-ocm-addons/templates/status-addon/addon-clusterrolebinding.yaml b/charts/rcs-ocm-addons/templates/status-addon/addon-clusterrolebinding.yaml
@@ -10,5 +10,5 @@ roleRef:
   name: {{ include "rcs-ocm-addons.fullname" . }}-capp-status-addon
 subjects:
   - kind: ServiceAccount
-    name: {{ include "rcs-ocm-addons.fullname" . }}-sa
+    name: {{ include "rcs-ocm-addons.fullname" . }}-capp-status-sa
     namespace: {{ .Release.Namespace }}
diff --git a/charts/rcs-ocm-addons/templates/status-addon/cluster-management-addon.yaml b/charts/rcs-ocm-addons/templates/status-addon/cluster-management-addon.yaml
@@ -1,7 +1,8 @@
 apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
-  name: {{ include "rcs-ocm-addons.fullname" . }}-capp-status-addon
+  name: capp-status-addon
+  namespace: {{ .Release.Namespace }}
   labels:
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
   annotations:

diff --git a/charts/rcs-ocm-addons/templates/status-addon/deployment.yaml b/charts/rcs-ocm-addons/templates/status-addon/deployment.yaml
@@ -3,18 +3,18 @@ kind: Deployment
 metadata:
   name: {{ include "rcs-ocm-addons.fullname" . }}-status-addon-manager
   labels:
-    app: rcs-score-addon-manager
+    app: {{ include "rcs-ocm-addons.fullname" . }}-status-addon-manager
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: rcs-score-addon-manager
+      app: {{ include "rcs-ocm-addons.fullname" . }}-status-addon-manager
     {{- include "rcs-ocm-addons.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: rcs-score-addon-manager
+        app: {{ include "rcs-ocm-addons.fullname" . }}-status-addon-manager
       {{- include "rcs-ocm-addons.selectorLabels" . | nindent 8 }}
     spec:
       securityContext:
@@ -26,15 +26,15 @@ spec:
       affinity:
         {{- toYaml .Values.affinity | nindent 8 }}
       containers:
-        - name: rcs-score-addon-manager
+        - name: rcs-status-addon-manager
           image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
-          {{- range .Values.manager.score.command }}
+          {{- range .Values.manager.status.command }}
           - {{ . | quote }}
           {{- end }}
           args:
-          {{- range .Values.manager.score.args }}
+          {{- range .Values.manager.status.args }}
           - {{ . | quote }}
           {{- end }}
           securityContext:
@@ -49,4 +49,4 @@ spec:
           env:
             - name: ADDON_IMAGE
               value: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
-      serviceAccountName: {{ include "rcs-ocm-addons.fullname" . }}-addon-sa
+      serviceAccountName: {{ include "rcs-ocm-addons.fullname" . }}-capp-status-sa
diff --git a/charts/rcs-ocm-addons/templates/status-addon/serviceaccount.yaml b/charts/rcs-ocm-addons/templates/status-addon/serviceaccount.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "rcs-ocm-addons.fullname" . }}-sa
+  name: {{ include "rcs-ocm-addons.fullname" . }}-capp-status-sa
   labels:
   {{- include "rcs-ocm-addons.labels" . | nindent 4 }}
diff --git a/charts/rcs-ocm-addons/values.yaml b/charts/rcs-ocm-addons/values.yaml
@@ -67,7 +67,7 @@ installStrategy:
       - configs:
           - group: addon.open-cluster-management.io
             name: rcs-score-deploy-config
-            namespace: open-cluster-management-hu
+            namespace: open-cluster-management-hub
             resource: addondeploymentconfigs
         name: all-clusters
         namespace: test

diff --git a/score/deploy/resources/default/kustomization.yaml b/score/deploy/resources/default/kustomization.yaml
@@ -7,8 +7,8 @@ resources:
 
 images:
 - name: controller
-  newName: controller
-  newTag: latest
+  newName: ghcr.io/dana-team/rcs-ocm-addons
+  newTag: main
 
 patches:
 - path: addon_manager_env_var_patch.yaml

diff --git a/score/scorehub/manager.go b/score/scorehub/manager.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	addonImageDefault          = "ghcr.io/dana-team/rcs-ocm-deployer:main"
+	addonImageDefault          = "hcr.io/dana-team/rcs-ocm-addons:main"
 	AddonName                  = "rcs-score"
 	templatePath               = "manifests/templates"
 	agentInstallationNamespace = "open-cluster-management-agent-addon"

diff --git a/status/deploy/resources/default/kustomization.yaml b/status/deploy/resources/default/kustomization.yaml
@@ -7,8 +7,8 @@ resources:
 
 images:
 - name: controller
-  newName: controller
-  newTag: latest
+  newName: ghcr.io/dana-team/rcs-ocm-addons
+  newTag: main
 
 patches:
 - path: addon_manager_env_var_patch.yaml

diff --git a/status/statushub/manager.go b/status/statushub/manager.go
@@ -41,7 +41,7 @@ const (
 	templatePath          = "manifests/templates"
 	agentNameLength       = 5
 	agentInstallNameSpace = "open-cluster-management-agent-addon"
-	addonImageDefault     = "ghcr.io/dana-team/rcs-ocm-deployer:main"
+	addonImageDefault     = "hcr.io/dana-team/rcs-ocm-addons:main"
 )
 
 //go:embed manifests