move opsdefiniton YAMLs to templates directory

apecloud · Jul 19, 2024 · 64106ab · 64106ab
1 parent 1b7b5b9
commit 64106ab
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/addons/kafka/opsdefinitions/quota-preconditions b/addons/kafka/opsdefinitions/quota-preconditions
@@ -0,0 +1,3 @@
+- rule:
+    expression: '{{ eq .component.status.phase "Running" }}'
+    message: "Component is not in Running status."
diff --git a/addons/kafka/opsdefinitions/topic-preconditions b/addons/kafka/opsdefinitions/topic-preconditions
@@ -0,0 +1,3 @@
+- rule:
+    expression: '{{ eq .component.status.phase "Running" }}'
+    message: "Component is not in Running status."
diff --git a/addons/kafka/opsdefinitions/useracl-preconditions b/addons/kafka/opsdefinitions/useracl-preconditions
@@ -0,0 +1,3 @@
+- rule:
+    expression: '{{ eq .component.status.phase "Running" }}'
+    message: "Component is not in Running status."
diff --git a/addons/kafka/opsdefinitions/quota.yaml → ...kafka/templates/opsdefinitions/quota.yaml b/addons/kafka/opsdefinitions/quota.yaml → ...kafka/templates/opsdefinitions/quota.yaml
@@ -4,9 +4,7 @@ metadata:
   name: kafka-quota
 spec:
   preConditions:
-    - rule:
-        expression: '{{ eq .component.status.phase "Running" }}'
-        message: "Component is not in Running status."
+    {{- .Files.Get "opsdefinitions/quota-preconditions" | nindent 4 }}
   componentInfos:
   - componentDefinitionName: kafka-broker
     accountName: client
@@ -56,8 +54,8 @@ spec:
         podSpec:
           containers:
             - name: kafka-topic
-              image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/kafka:3.3.2-debian-11-r54
-              imagePullPolicy: IfNotPresent
+              image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.kafka.repository }}:{{ default .Chart.AppVersion .Values.images.kafka.tag }}
+              imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
               command:
                 - bash
                 - -c

diff --git a/addons/kafka/opsdefinitions/topic.yaml → ...kafka/templates/opsdefinitions/topic.yaml b/addons/kafka/opsdefinitions/topic.yaml → ...kafka/templates/opsdefinitions/topic.yaml
@@ -4,9 +4,7 @@ metadata:
   name: kafka-topic
 spec:
   preConditions:
-    - rule:
-        expression: '{{ eq .component.status.phase "Running" }}'
-        message: "Component is not in Running status."
+    {{- .Files.Get "opsdefinitions/topic-preconditions" | nindent 4 }}
   componentInfos:
   - componentDefinitionName: kafka-broker
     accountName: client
@@ -61,8 +59,8 @@ spec:
         podSpec:
           containers:
             - name: kafka-topic
-              image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/kafka:3.3.2-debian-11-r54
-              imagePullPolicy: IfNotPresent
+              image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.kafka.repository }}:{{ default .Chart.AppVersion .Values.images.kafka.tag }}
+              imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
               command:
                 - bash
                 - -c

diff --git a/addons/kafka/opsdefinitions/useracl.yaml → ...fka/templates/opsdefinitions/useracl.yaml b/addons/kafka/opsdefinitions/useracl.yaml → ...fka/templates/opsdefinitions/useracl.yaml
@@ -4,9 +4,7 @@ metadata:
   name: kafka-user-acl
 spec:
   preConditions:
-    - rule:
-        expression: '{{ eq .component.status.phase "Running" }}'
-        message: "Component is not in Running status."
+    {{- .Files.Get "opsdefinitions/topic-preconditions" | nindent 4 }}
   componentInfos:
   - componentDefinitionName: kafka-broker
     accountName: client
@@ -102,8 +100,8 @@ spec:
         podSpec:
           containers:
           - name: kafka-topic
-            image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/kafka:3.3.2-debian-11-r54
-            imagePullPolicy: IfNotPresent
+            image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.kafka.repository }}:{{ default .Chart.AppVersion .Values.images.kafka.tag }}
+            imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
             command:
             - bash
             - -c