Merge pull request #2556 from mflendrich/rack-rendering

Render `.spec.datacenter.racks` directly in Helm template

Author: scylla-operator-bot[bot]

deploy/manager-dev.yaml

@@ -310,18 +310,8 @@ spec:
   datacenter:
     name: manager-dc
     racks:
-      - name: manager-rack
-        members: 1
-        storage:
-          capacity: 5Gi
-          storageClassName: scylladb-local-xfs
-        resources:
-          limits:
-            cpu: 200m
-            memory: 200Mi
-          requests:
-            cpu: 10m
-            memory: 100Mi
+      - members: 1
+        name: manager-rack
         placement:
           nodeAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
@@ -336,5 +326,15 @@ spec:
               key: scylla-operator.scylladb.com/dedicated
               operator: Equal
               value: scyllaclusters
+        resources:
+          limits:
+            cpu: 200m
+            memory: 200Mi
+          requests:
+            cpu: 10m
+            memory: 100Mi
+        storage:
+          capacity: 5Gi
+          storageClassName: scylladb-local-xfs
 
 ---

deploy/manager-prod.yaml

@@ -310,18 +310,8 @@ spec:
   datacenter:
     name: manager-dc
     racks:
-    - name: manager-rack
-      members: 1
-      storage:
-        capacity: 5Gi
-        storageClassName: scylladb-local-xfs
-      resources:
-        limits:
-          cpu: 1
-          memory: 200Mi
-        requests:
-          cpu: 1
-          memory: 200Mi
+    - members: 1
+      name: manager-rack
       placement:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -332,9 +322,19 @@ spec:
                 values:
                 - scylla
         tolerations:
-          - effect: NoSchedule
-            key: scylla-operator.scylladb.com/dedicated
-            operator: Equal
-            value: scyllaclusters
+        - effect: NoSchedule
+          key: scylla-operator.scylladb.com/dedicated
+          operator: Equal
+          value: scyllaclusters
+      resources:
+        limits:
+          cpu: 1
+          memory: 200Mi
+        requests:
+          cpu: 1
+          memory: 200Mi
+      storage:
+        capacity: 5Gi
+        storageClassName: scylladb-local-xfs
 
 ---

deploy/manager/dev/50_scyllacluster.yaml

@@ -13,18 +13,8 @@ spec:
   datacenter:
     name: manager-dc
     racks:
-      - name: manager-rack
-        members: 1
-        storage:
-          capacity: 5Gi
-          storageClassName: scylladb-local-xfs
-        resources:
-          limits:
-            cpu: 200m
-            memory: 200Mi
-          requests:
-            cpu: 10m
-            memory: 100Mi
+      - members: 1
+        name: manager-rack
         placement:
           nodeAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
@@ -39,3 +29,13 @@ spec:
               key: scylla-operator.scylladb.com/dedicated
               operator: Equal
               value: scyllaclusters
+        resources:
+          limits:
+            cpu: 200m
+            memory: 200Mi
+          requests:
+            cpu: 10m
+            memory: 100Mi
+        storage:
+          capacity: 5Gi
+          storageClassName: scylladb-local-xfs

deploy/manager/prod/50_scyllacluster.yaml

@@ -13,18 +13,8 @@ spec:
   datacenter:
     name: manager-dc
     racks:
-    - name: manager-rack
-      members: 1
-      storage:
-        capacity: 5Gi
-        storageClassName: scylladb-local-xfs
-      resources:
-        limits:
-          cpu: 1
-          memory: 200Mi
-        requests:
-          cpu: 1
-          memory: 200Mi
+    - members: 1
+      name: manager-rack
       placement:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -35,7 +25,17 @@ spec:
                 values:
                 - scylla
         tolerations:
-          - effect: NoSchedule
-            key: scylla-operator.scylladb.com/dedicated
-            operator: Equal
-            value: scyllaclusters
+        - effect: NoSchedule
+          key: scylla-operator.scylladb.com/dedicated
+          operator: Equal
+          value: scyllaclusters
+      resources:
+        limits:
+          cpu: 1
+          memory: 200Mi
+        requests:
+          cpu: 1
+          memory: 200Mi
+      storage:
+        capacity: 5Gi
+        storageClassName: scylladb-local-xfs

helm/scylla/templates/scyllacluster.yaml

@@ -69,53 +69,7 @@ spec:
   {{- end }}
   datacenter:
     name: {{ .Values.datacenter }}
+    {{- with .Values.racks }}
     racks:
-    {{- range .Values.racks }}
-    - name: {{ .name }}
-      {{- with .scyllaConfig }}
-      scyllaConfig: {{ . }}
-      {{- end }}
-      {{- with .scyllaAgentConfig }}
-      scyllaAgentConfig: {{ . }}
-      {{- end }}
-      members: {{ .members }}
-      storage:
-        {{- .storage | toYaml | nindent 8 }}
-      resources:
-        {{- toYaml .resources | nindent 8 }}
-      {{- if .agentResources }}
-      agentResources:
-        {{- toYaml .agentResources | nindent 8 }}
-      {{- end }}
-      {{- if .volumes }}
-      volumes:
-        {{- toYaml .volumes | nindent 8 }}
-      {{- end }}
-      {{- if .volumeMounts }}
-      volumeMounts:
-        {{- toYaml .volumeMounts | nindent 8 }}
-      {{- end }}
-      {{- if .agentVolumeMounts }}
-      agentVolumeMounts:
-        {{- toYaml .agentVolumeMounts | nindent 8 }}
-      {{- end }}
-      {{- if .placement }}
-      placement:
-        {{- if .placement.podAffinity }}
-        podAffinity:
-          {{- toYaml .placement.podAffinity | nindent 10 }}
-        {{- end }}
-        {{- if .placement.podAntiAffinity }}
-        podAntiAffinity:
-          {{- toYaml .placement.podAntiAffinity | nindent 10 }}
-        {{- end }}
-        {{- if .placement.nodeAffinity }}
-        nodeAffinity:
-          {{- toYaml .placement.nodeAffinity | nindent 10 }}
-        {{- end }}
-        {{- if .placement.tolerations }}
-        tolerations:
-          {{- toYaml .placement.tolerations | nindent 10 }}
-        {{- end }}
-      {{- end }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}