Fix indentation in datacatalog deployment template (#1495)

* Fix indentation in datacatalog deployment template Signed-off-by: Sören Brunk <[email protected]> * make helm to change the readmes Signed-off-by: Yee Hing Tong <[email protected]> Co-authored-by: Yee Hing Tong <[email protected]>
flyteorg · Sep 21, 2021 · c158263 · c158263
1 parent f3a382a
commit c158263
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 191 deletions.
diff --git a/charts/flyte-core/templates/datacatalog/deployment.yaml b/charts/flyte-core/templates/datacatalog/deployment.yaml
@@ -35,30 +35,30 @@ spec:
           image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
           imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
           name: run-migrations
-          volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
+          volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 12 }}
             - mountPath: /etc/datacatalog/config
               name: config-volume
       containers:
         - command:
             - datacatalog
             - --config
             - {{ .Values.datacatalog.configPath }}
-          {{- with .Values.datacatalog.extraArgs }}
-          {{- toYaml . | nindent 8 }}
-          {{- end }}
-          - serve
+            {{- with .Values.datacatalog.extraArgs }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+            - serve
           image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
           imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
           name: datacatalog
           ports:
             - containerPort: 8088
             - containerPort: 8089
-          resources: {{ toYaml .Values.datacatalog.resources | nindent 10 }}
-          volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
+          resources: {{ toYaml .Values.datacatalog.resources | nindent 12 }}
+          volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 12 }}
             - mountPath: /etc/datacatalog/config
               name: config-volume
       serviceAccountName: {{ template "datacatalog.name" . }}
-      volumes: {{- include "databaseSecret.volume" . | nindent 6 }}
+      volumes: {{- include "databaseSecret.volume" . | nindent 8 }}
         - emptyDir: {}
           name: shared-data
         - configMap:

diff --git a/charts/flyte/templates/datacatalog/deployment.yaml b/charts/flyte/templates/datacatalog/deployment.yaml
@@ -18,52 +18,52 @@ spec:
       labels: {{ include "datacatalog.labels" . | nindent 8 }}
     spec:
       initContainers:
-      {{- if .Values.postgres.enabled }}
-      - name: check-db-ready
-        image: postgres:10.16-alpine
-        command:
-          - sh
-          - -c
-          - until pg_isready -h {{ tpl .Values.db.datacatalog.database.host $ }} -p {{ .Values.db.datacatalog.database.port }}; do echo waiting for database; sleep 2; done;
-      {{- end }}
-      - command:
-        - datacatalog
-        - --config
-        - {{ .Values.datacatalog.configPath }}
-        - migrate
-        - run
-        image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
-        imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
-        name: run-migrations
-        volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
-        - mountPath: /etc/datacatalog/config
-          name: config-volume
-      containers:
-      - command:
-        - datacatalog
-        - --config
-        - {{ .Values.datacatalog.configPath }}
-        {{- with .Values.datacatalog.extraArgs }}
-        {{- toYaml . | nindent 8 }}
+        {{- if .Values.postgres.enabled }}
+        - name: check-db-ready
+          image: postgres:10.16-alpine
+          command:
+            - sh
+            - -c
+            - until pg_isready -h {{ tpl .Values.db.datacatalog.database.host $ }} -p {{ .Values.db.datacatalog.database.port }}; do echo waiting for database; sleep 2; done;
         {{- end }}
-        - serve
-        image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
-        imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
-        name: datacatalog
-        ports:
-        - containerPort: 8088
-        - containerPort: 8089
-        resources: {{ toYaml .Values.datacatalog.resources | nindent 10 }}
-        volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
-        - mountPath: /etc/datacatalog/config
-          name: config-volume
+        - command:
+            - datacatalog
+            - --config
+            - {{ .Values.datacatalog.configPath }}
+            - migrate
+            - run
+          image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
+          imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
+          name: run-migrations
+          volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 12 }}
+            - mountPath: /etc/datacatalog/config
+              name: config-volume
+      containers:
+        - command:
+            - datacatalog
+            - --config
+            - {{ .Values.datacatalog.configPath }}
+            {{- with .Values.datacatalog.extraArgs }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+            - serve
+          image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
+          imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
+          name: datacatalog
+          ports:
+            - containerPort: 8088
+            - containerPort: 8089
+          resources: {{ toYaml .Values.datacatalog.resources | nindent 12 }}
+          volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 12 }}
+            - mountPath: /etc/datacatalog/config
+              name: config-volume
       serviceAccountName: {{ template "datacatalog.name" . }}
-      volumes: {{- include "databaseSecret.volume" . | nindent 6 }}
-      - emptyDir: {}
-        name: shared-data
-      - configMap:
-          name: datacatalog-config
-        name: config-volume
+      volumes: {{- include "databaseSecret.volume" . | nindent 8 }}
+        - emptyDir: {}
+          name: shared-data
+        - configMap:
+            name: datacatalog-config
+          name: config-volume
       {{- with .Values.datacatalog.nodeSelector }}
       nodeSelector: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
@@ -1557,56 +1557,56 @@ spec:
         app.kubernetes.io/managed-by: Helm
     spec:
       initContainers:
-      - command:
-        - datacatalog
-        - --config
-        - /etc/datacatalog/config/*.yaml
-        - migrate
-        - run
-        image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
-        imagePullPolicy: "IfNotPresent"
-        name: run-migrations
-        volumeMounts:
-        - mountPath: /etc/db
-          name: db-pass
-        - mountPath: /etc/datacatalog/config
-          name: config-volume
+        - command:
+            - datacatalog
+            - --config
+            - /etc/datacatalog/config/*.yaml
+            - migrate
+            - run
+          image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
+          imagePullPolicy: "IfNotPresent"
+          name: run-migrations
+          volumeMounts:
+            - mountPath: /etc/db
+              name: db-pass
+            - mountPath: /etc/datacatalog/config
+              name: config-volume
       containers:
-      - command:
-        - datacatalog
-        - --config
-        - /etc/datacatalog/config/*.yaml
-        - serve
-        image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
-        imagePullPolicy: "IfNotPresent"
-        name: datacatalog
-        ports:
-        - containerPort: 8088
-        - containerPort: 8089
-        resources: 
-          limits:
-            cpu: 500m
-            ephemeral-storage: 200Mi
-            memory: 500Mi
-          requests:
-            cpu: 50m
-            ephemeral-storage: 200Mi
-            memory: 200Mi
-        volumeMounts:
-        - mountPath: /etc/db
-          name: db-pass
-        - mountPath: /etc/datacatalog/config
-          name: config-volume
+        - command:
+            - datacatalog
+            - --config
+            - /etc/datacatalog/config/*.yaml
+            - serve
+          image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
+          imagePullPolicy: "IfNotPresent"
+          name: datacatalog
+          ports:
+            - containerPort: 8088
+            - containerPort: 8089
+          resources: 
+            limits:
+              cpu: 500m
+              ephemeral-storage: 200Mi
+              memory: 500Mi
+            requests:
+              cpu: 50m
+              ephemeral-storage: 200Mi
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /etc/db
+              name: db-pass
+            - mountPath: /etc/datacatalog/config
+              name: config-volume
       serviceAccountName: datacatalog
       volumes:
-      - name: db-pass
-        secret:
-          secretName: db-pass
-      - emptyDir: {}
-        name: shared-data
-      - configMap:
-          name: datacatalog-config
-        name: config-volume
+        - name: db-pass
+          secret:
+            secretName: db-pass
+        - emptyDir: {}
+          name: shared-data
+        - configMap:
+            name: datacatalog-config
+          name: config-volume
       affinity: 
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -1441,52 +1441,52 @@ spec:
         app.kubernetes.io/managed-by: Helm
     spec:
       initContainers:
-      - command:
-        - datacatalog
-        - --config
-        - /etc/datacatalog/config/*.yaml
-        - migrate
-        - run
-        image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
-        imagePullPolicy: "IfNotPresent"
-        name: run-migrations
-        volumeMounts:
-
-        - mountPath: /etc/datacatalog/config
-          name: config-volume
+        - command:
+            - datacatalog
+            - --config
+            - /etc/datacatalog/config/*.yaml
+            - migrate
+            - run
+          image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
+          imagePullPolicy: "IfNotPresent"
+          name: run-migrations
+          volumeMounts:
+            
+            - mountPath: /etc/datacatalog/config
+              name: config-volume
       containers:
-      - command:
-        - datacatalog
-        - --config
-        - /etc/datacatalog/config/*.yaml
-        - serve
-        image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
-        imagePullPolicy: "IfNotPresent"
-        name: datacatalog
-        ports:
-        - containerPort: 8088
-        - containerPort: 8089
-        resources: 
-          limits:
-            cpu: 500m
-            ephemeral-storage: 100Mi
-            memory: 500Mi
-          requests:
-            cpu: 10m
-            ephemeral-storage: 50Mi
-            memory: 50Mi
-        volumeMounts:
-
-        - mountPath: /etc/datacatalog/config
-          name: config-volume
+        - command:
+            - datacatalog
+            - --config
+            - /etc/datacatalog/config/*.yaml
+            - serve
+          image: "cr.flyte.org/flyteorg/datacatalog:v0.3.9"
+          imagePullPolicy: "IfNotPresent"
+          name: datacatalog
+          ports:
+            - containerPort: 8088
+            - containerPort: 8089
+          resources: 
+            limits:
+              cpu: 500m
+              ephemeral-storage: 100Mi
+              memory: 500Mi
+            requests:
+              cpu: 10m
+              ephemeral-storage: 50Mi
+              memory: 50Mi
+          volumeMounts:
+            
+            - mountPath: /etc/datacatalog/config
+              name: config-volume
       serviceAccountName: datacatalog
       volumes:
-
-      - emptyDir: {}
-        name: shared-data
-      - configMap:
-          name: datacatalog-config
-        name: config-volume
+        
+        - emptyDir: {}
+          name: shared-data
+        - configMap:
+            name: datacatalog-config
+          name: config-volume
 ---
 # Source: flyte/templates/propeller/deployment.yaml
 apiVersion: apps/v1