Browse Source

Fixing some helm linting and an error on e2e Makefile

Signed-off-by: Gustavo Carvalho <gustavo.carvalho@container-solutions.com>
Gustavo Carvalho 4 years ago
parent
commit
3c167edd4b

+ 3 - 3
deploy/charts/external-secrets/templates/cert-controller-service.yaml

@@ -12,9 +12,9 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.certController.prometheus.service.port }}
-      protocol: TCP
-      name: metrics
+  - port: {{ .Values.certController.prometheus.service.port }}
+    protocol: TCP
+    name: metrics
   selector:
     {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 4 }}
 {{- end }}

+ 1 - 1
deploy/charts/external-secrets/templates/webhook-secret.yaml

@@ -4,4 +4,4 @@ metadata:
   name: {{ include "external-secrets.fullname" . }}-webhook
   labels:
     {{- include "external-secrets-webhook.labels" . | nindent 4 }}
-    external-secrets.io/component : webhook
+    external-secrets.io/component : webhook

+ 8 - 8
deploy/charts/external-secrets/templates/webhook-service.yaml

@@ -8,13 +8,13 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: 443
-      targetPort: 9443
-      protocol: TCP
-      name: webhook
-    - port: {{ .Values.webhook.prometheus.service.port}}
-      targetPort: {{ .Values.webhook.prometheus.service.port}}
-      protocol: TCP
-      name: metrics
+  - port: 443
+    targetPort: 9443
+    protocol: TCP
+    name: webhook
+  - port: {{ .Values.webhook.prometheus.service.port}}
+    targetPort: {{ .Values.webhook.prometheus.service.port}}
+    protocol: TCP
+    name: metrics
   selector:
     {{- include "external-secrets-webhook.selectorLabels" . | nindent 4 }}

+ 2 - 2
e2e/Makefile

@@ -23,8 +23,8 @@ test: e2e-image ## Run e2e tests against current kube context
 		BUILD_ARGS="${BUILD_ARGS} --build-arg TARGETARCH=amd64 --build-arg TARGETOS=linux"
 	kind load docker-image --name="external-secrets" $(IMAGE_REGISTRY):$(VERSION)
 	kind load docker-image --name="external-secrets" $(E2E_IMAGE_REGISTRY):$(VERSION)
-	kind load docker-image --name="external-secrets-webhook" $(IMAGE_REGISTRY)-webhook:$(VERSION)
-	kind load docker-image --name="external-secrets-cert-controller" $(IMAGE_REGISTRY)-cert-controller:$(VERSION)
+	kind load docker-image --name="external-secrets" $(IMAGE_REGISTRY)-webhook:$(VERSION)
+	kind load docker-image --name="external-secrets" $(IMAGE_REGISTRY)-cert-controller:$(VERSION)
 	./run.sh
 
 test.managed: e2e-image ## Run e2e tests against current kube context