fix: linting problems

spacelift-io · Aug 16, 2024 · 8f4249e · 8f4249e
1 parent d4afe16
commit 8f4249e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/spacelift-promex/templates/deployment.yaml b/spacelift-promex/templates/deployment.yaml
@@ -4,15 +4,15 @@ metadata:
   name: {{ include "spacelift-promex.fullname" . }}
   labels:
     {{- include "spacelift-promex.labels" . | nindent 4 }}
-    {{- with .Values.spaceliftPromex.labels }}
+    {{- with .Values.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-  {{- with .Values.spaceliftPromex.annotations }}
+  {{- with .Values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  replicas: {{ .Values.spaceliftPromex.replicaCount }}
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "spacelift-promex.selectorLabels" . | nindent 6 }}
@@ -21,18 +21,18 @@ spec:
       labels:
         {{- include "spacelift-promex.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.spaceliftPromex.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
         - name: spacelift-promex
-          {{- if .Values.spaceliftPromex.image.digest }}
-          image: "{{ .Values.spaceliftPromex.image.repository }}@{{ .Values.spaceliftPromex.image.digest }}"
+          {{- if .Values.image.digest }}
+          image: "{{ .Values.image.repository }}@{{ .Values.image.digest }}"
           {{- else }}
-          image: "{{ .Values.spaceliftPromex.image.repository }}:{{ .Values.spaceliftPromex.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           {{- end }}
-          imagePullPolicy: {{ .Values.spaceliftPromex.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: metrics
               containerPort: 9953
@@ -43,13 +43,13 @@ spec:
             periodSeconds: 5
           env:
             - name: "SPACELIFT_PROMEX_API_ENDPOINT"
-              value: "{{ required "must include spacelift.apiEndpoint in values" .Values.spacelift.apiEndpoint }}"
+              value: "{{ .Values.apiEndpoint | required "must include apiEndpoint in values" }}"
             - name: "SPACELIFT_PROMEX_API_KEY_ID"
-              value: "{{ required "must include spacelift.apiKeyId in values" .Values.spacelift.apiKeyId }}"
+              value: "{{ .Values.apiKeyId | required "must include apiKeyId in values" }}"
             - name: "SPACELIFT_PROMEX_API_KEY_SECRET"
               valueFrom:
                 secretKeyRef:
-                  name: {{ required "must include spacelift.apiKeySecretName in values" .Values.spacelift.apiKeySecretName }}
+                  name: {{ .Values.apiKeySecretName | required "must include apiKeySecretName in values" }}
                   key: "SPACELIFT_PROMEX_API_KEY_SECRET"
             - name: "SPACELIFT_PROMEX_LISTEN_ADDRESS"
-              value: "{{ .Values.spaceliftPromex.listenAddress}}"
+              value: "{{ .Values.listenAddress}}"
diff --git a/spacelift-promex/values.yaml b/spacelift-promex/values.yaml
@@ -1,28 +1,27 @@
-spaceliftPromex:
-  replicaCount: 1
-  image:
-    repository: public.ecr.aws/spacelift/promex
-    tag: v0.3.1
-    pullPolicy: IfNotPresent
+replicaCount: 1
 
+image:
+  repository: public.ecr.aws/spacelift/promex
+  tag: v0.3.1
+  pullPolicy: IfNotPresent
 
-  # The address to listen on for HTTP requests
-  listenAddress: ":9953"
 
-#  # Labels to add to the deployment
-#  labels:
-#      app.spacelift.io/example: spacelift-promx
+# The address to listen on for HTTP requests
+listenAddress: ":9953"
 
-#  # Annotations to add to the deployment
-#  annotations:
-#    app.spacelift.io/example: spacelift-promx
+# Labels to add to the deployment
+labels:
+    app.spacelift.io/example: spacelift-promx
 
-spacelift:
-#  # Your api endpoint, must be provided
-#  apiEndpoint: https://{myaccount}.app.spacelift.io
+# Annotations to add to the deployment
+annotations:
+  app.spacelift.io/example: spacelift-promx
+
+## Your api endpoint, must be provided
+#apiEndpoint: https://{myaccount}.app.spacelift.io
 #
-#  # Your api key id, must be provided
-#  apiKeyId: ""
+## Your api key id, must be provided
+#apiKeyId: ""
 #
-#  # your api key secret, the secret should contain the key "SPACELIFT_PROMEX_API_KEY_SECRET"
-#  apiKeySecretName: ""
+## your api key secret, the secret should contain the key "SPACELIFT_PROMEX_API_KEY_SECRET"
+#apiKeySecretName: ""