fix

Author: paia0720

operator/charts/helm/rabbitmq/templates/_helpers.tpl

@@ -191,15 +191,7 @@ Image can be found from:
 * or from default values .Values.operatorImage
 */}}
 {{- define "operator.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if index .Values.deployDescriptor "rabbitmq" -}}
-      {{- printf "%s" (index .Values.deployDescriptor "rabbitmq" "image") -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.operator.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.operatorImage -}}
-  {{- end -}}
+  {{- printf "%s" .Values.operatorImage -}}
 {{- end -}}
 
 {{/*
@@ -210,45 +202,21 @@ Image can be found from:
 * or from default values .Values.disasterRecovery.image
 */}}
 {{- define "disasterRecovery.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if .Values.disasterRecoveryImage -}}
-      {{- printf "%s" .Values.disasterRecoveryImage -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.disasterRecoveryImage.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.disasterRecovery.image -}}
-  {{- end -}}
+  {{- printf "%s" .Values.disasterRecovery.image -}}
 {{- end -}}
 
 {{/*
 Find a RabbitMQ backup daemon image in various places.
 */}}
 {{- define "backupDaemon.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if .Values.backupDaemonImage -}}
-      {{- printf "%s" .Values.backupDaemonImage -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.backupDaemonImage.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.backupDaemon.image -}}
-  {{- end -}}
+  {{- printf "%s" .Values.backupDaemon.image -}}
 {{- end -}}
 
 {{/*
 Find a RabbitMQ image in various places.
 */}}
 {{- define "rabbitmq.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if .Values.rabbitmqImage -}}
-      {{- printf "%s" .Values.rabbitmqImage -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.rabbitmqImage.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.rabbitmq.dockerImage -}}
-  {{- end -}}
+  {{- printf "%s" .Values.rabbitmq.dockerImage -}}
 {{- end -}}
 
 {{/*
@@ -299,60 +267,28 @@ RabbitMQ admin password.
 Find a RabbitMQ tests image in various places.
 */}}
 {{- define "tests.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if .Values.testsImage -}}
-      {{- printf "%s" .Values.testsImage -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.testsImage.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.tests.dockerImage -}}
-  {{- end -}}
+  {{- printf "%s" .Values.tests.dockerImage -}}
 {{- end -}}
 
 {{/*
 Find a RabbitMQ telegraf image in various places.
 */}}
 {{- define "telegraf.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if .Values.telegrafImage -}}
-      {{- printf "%s" .Values.telegrafImage -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.telegrafImage.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.telegraf.dockerImage -}}
-  {{- end -}}
+  {{- printf "%s" .Values.telegraf.dockerImage -}}
 {{- end -}}
 
 {{/*
 Find a Deployment Status Provisioner image in various places.
 */}}
 {{- define "deployment-status-provisioner.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if .Values.statusProvisionerImage -}}
-      {{- printf "%s" .Values.statusProvisionerImage -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.statusProvisionerImage.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.statusProvisioner.dockerImage -}}
-  {{- end -}}
+  {{- printf "%s" .Values.statusProvisioner.dockerImage -}}
 {{- end -}}
 
 {{/*
 Find a kubectl image in various places.
 */}}
 {{- define "kubectl.image" -}}
-  {{- if .Values.deployDescriptor -}}
-    {{- if .Values.kubectl -}}
-      {{- printf "%s" .Values.kubectl -}}
-    {{- else -}}
-      {{- printf "%s" (index .Values.deployDescriptor.kubectl.image) -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "%s" .Values.operator.restartScheduler.dockerImage -}}
-  {{- end -}}
+  {{- printf "%s" .Values.operator.restartScheduler.dockerImage -}}
 {{- end -}}
 
 {{/*

operator/charts/helm/rabbitmq/templates/cr.yaml

@@ -1,7 +1,7 @@
 {{- if and .Values.deployDescriptor .Values.rabbitmqImage (ne (.Values.DEPLOY_W_HELM | toString) "true") }}
   {{- fail "RabbitMQ requires `DEPLOY_W_HELM` parameter to be set to `true` for App Deployer" }}
 {{- end }}
-apiVersion: qubership.org/v2
+apiVersion: {{ .Values.operator.apiGroup }}/v2
 kind: RabbitMQService
 metadata:
   name: {{ default "rabbitmq-service" .Values.name }}

operator/charts/helm/rabbitmq/templates/deployment.yaml

@@ -29,7 +29,7 @@ spec:
         name: rabbitmq-operator
       annotations:
         post.hook.restore.velero.io/command: '["python3", "/opt/operator/velero_delete_pods_rmqlocal.py"]'
-        qubership.org/cr-checksum: {{ include (print .Template.BasePath "/cr.yaml") . | sha256sum | trunc 63 }}
+        {{ .Values.operator.apiGroup }}/cr-checksum: {{ include (print .Template.BasePath "/cr.yaml") . | sha256sum | trunc 63 }}
     spec:
       securityContext:
         {{- include "rabbitmq.globalPodSecurityContext" . | nindent 8 }}
@@ -168,7 +168,7 @@ spec:
               value: "{{ (include "disasterRecovery.cipherSuites" .) | trimSuffix "," }}"
             {{- end }}
             - name: RESOURCE_FOR_DR
-              value: "qubership.org v2 rabbitmqservices rabbitmq-service"
+              value: "{{ .Values.operator.apiGroup }} v2 rabbitmqservices rabbitmq-service"
             - name: USE_DEFAULT_PATHS
               value: "true"
             - name: HEALTH_MAIN_SERVICES_ACTIVE

operator/charts/helm/rabbitmq/templates/integration_tests/role.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "rabbitmq.defaultLabels" . | nindent 4 }}
 rules:
   - apiGroups:
-      - qubership.org
+      - {{ .Values.operator.apiGroup }}
     resources:
       - rabbitmqservices
       - rabbitmqservices/status

operator/charts/helm/rabbitmq/templates/rabbit_secret.yaml

@@ -7,7 +7,7 @@ data:
 kind: Secret
 metadata:
   labels:
-    deploy.qubership.org/change-credentials: "true"
+    deploy.{{ .Values.operator.apiGroup }}/change-credentials: "true"
     {{- include "rabbitmq.defaultLabels" . | nindent 4 }}
   name: rabbitmq-default-secret
 type: Opaque

operator/charts/helm/rabbitmq/templates/role.yaml

@@ -8,7 +8,7 @@ metadata:
   name: rabbitmq-operator
 rules:
 - apiGroups:
-  - qubership.org
+  - {{ .Values.operator.apiGroup }}
   resources:
   - "*"
   verbs:

operator/charts/helm/rabbitmq/templates/site-manager.yaml

@@ -1,6 +1,6 @@
 {{- if and (eq (include "rabbitmq.enableDisasterRecovery" . ) "true") (not .Values.backupDaemon.enabled)}}{{ fail "backupDaemon.enabled must be true if disaster recovery is enabled" }}{{ end -}}
 {{- if and (eq (include "rabbitmq.enableDisasterRecovery" . ) "true") .Values.disasterRecovery.siteManagerEnabled }}
-apiVersion: qubership.org/v3
+apiVersion: {{ .Values.global.disasterRecovery.siteManagerApiGroup }}/v3
 kind: SiteManager
 metadata:
   name: rabbitmq-{{ .Release.Namespace }}

operator/charts/helm/rabbitmq/templates/status-provisioner/status-provisioner-job.yaml

@@ -48,7 +48,7 @@ spec:
             - name: MONITORED_RESOURCES
               value: "{{ include "rabbitmq.monitoredResources" . | trim | trimSuffix "," }}"
             - name: RESOURCE_TO_SET_STATUS
-              value: "qubership.org v2 rabbitmqservices {{ default "rabbitmq-service" .Values.name }}"
+              value: "{{ .Values.operator.apiGroup }} v2 rabbitmqservices {{ default "rabbitmq-service" .Values.name }}"
             - name: CONDITION_REASON
               value: "RabbitMQExternalServiceReadinessStatus"
             - name: POD_READINESS_TIMEOUT

operator/charts/helm/rabbitmq/templates/status-provisioner/status-provisioner-role.yaml

@@ -7,7 +7,7 @@ metadata:
   name: rabbitmq-status-provisioner
 rules:
   - apiGroups:
-      - qubership.org
+      - {{ .Values.operator.apiGroup }}
     resources:
       - "*"
     verbs:

operator/charts/helm/rabbitmq/values.yaml

@@ -5,14 +5,13 @@
 
 # name: rabbitmq-service
 #
-operatorImage: artifactorycn.qubership.org:17008/thirdparty/thirdparty.platform.services_rabbitmq:master_latest_operator
+operatorImage: ghcr.io/netcracker/qubership-rabbitmq-service-operator:main
 #
 # loglevel: INFO
 
 allowEvents: false
 
 global:
-  cloudIntegrationEnabled: true
   tls:
     enabled: false
     cipherSuites: []
@@ -26,6 +25,8 @@ global:
   customLabels: {}
   securityContext: {}
   disableRunAsNonRoot: false
+  disasterRecovery:
+    siteManagerApiGroup: "qubership.org"
 
 operator:
   resources:
@@ -38,8 +39,9 @@ operator:
   customLabels: {}
   securityContext: {}
   priorityClassName: ""
+  apiGroup: "qubership.org"
   restartScheduler:
-    dockerImage: artifactorycn.qubership.org:17014/product/prod.platform.streaming_docker-kubectl:0.0.2_20230324-083045
+    dockerImage: bitnami/kubectl:1.30.6
     enabled: true
     schedule: "0 0 * * *"
     affinity: {}
@@ -67,7 +69,7 @@ externalRabbitmq:
   enableSsl: false
 
 disasterRecovery:
-  image: artifactorycn.qubership.org:17008/product/prod.platform.streaming_disaster-recovery-daemon:master_latest
+  image: ghcr.io/netcracker/qubership-disaster-recovery-daemon:main
   tls:
     enabled: true
     certificates:
@@ -134,7 +136,7 @@ rabbitmq:
 #    - paas-infra311-master-2
 #    - paas-infra311-master-3
   replicas: 3
-  dockerImage: "artifactorycn.qubership.org:17008/thirdparty/thirdparty.platform.services_rabbitmq:master_latest"
+  dockerImage: ghcr.io/netcracker/qubership-rabbitmq-image:main
   resources:
     requests:
       cpu: 1
@@ -220,7 +222,7 @@ rabbitmq:
 
 tests:
   runTests: false
-  dockerImage: "artifactorycn.qubership.org:17008/thirdparty/thirdparty.platform.services_rabbitmq:master_latest_operator_operator-robot-image"
+  dockerImage: ghcr.io/netcracker/qubership-rabbitmq-integration-tests:main
   statusWritingEnabled: true
   isShortStatusMessage: true
   runTestsOnly: false
@@ -259,7 +261,7 @@ backupDaemon:
       additionalIpAddresses: []
   # Enable Rabbitmq Backup Daemon installation.
   enabled: false
-  image: "artifactorycn.qubership.org:17008/thirdparty/thirdparty.platform.services_rabbitmq:master_latest_rabbitmq-backup-daemon"
+  image: ghcr.io/netcracker/qubership-rabbitmq-backup-daemon:main
 
   # storage and storageClass are the settings for configuring stateful
   # storage for the server pods. storage should be set to the disk size of
@@ -364,7 +366,7 @@ telegraf:
     requests:
       cpu: 150m
       memory: 150Mi
-  dockerImage: "artifactorycn.qubership.org:17008/thirdparty/thirdparty.platform.services_rabbitmq:master_latest_telegraf"
+  dockerImage: ghcr.io/netcracker/qubership-rabbitmq-monitoring:main
   install: false
   customLabels: {}
   securityContext: {}
@@ -373,7 +375,7 @@ telegraf:
 
 statusProvisioner:
   enabled: true
-  dockerImage: artifactorycn.qubership.org:17008/product/prod.platform.streaming_deployment-status-provisioner:master_latest
+  dockerImage: ghcr.io/netcracker/qubership-deployment-status-provisioner:main
   lifetimeAfterCompletion: 600
   podReadinessTimeout: 300
   resources: