Merge branch 'arttor:main' into jobtemplate-indent

arttor · Feb 16, 2024 · 55fe94a · 55fe94a
2 parents 286dbb2 + 2e9539c
commit 55fe94a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,9 +15,10 @@ jobs:
 
 # GO tests
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: '1.21'
+        cache: false
 
     - name: Fmt
       run: go fmt ./...
@@ -31,7 +32,7 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.51.2
+        version: v1.54
 # Dry-run generated charts in cluster
     - name: Install k8s cluster
       uses: helm/kind-action@v1.4.0

diff --git a/examples/app/templates/myapp-service.yaml b/examples/app/templates/myapp-service.yaml
@@ -11,4 +11,4 @@ spec:
     app: myapp
   {{- include "app.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.myappService.ports | toYaml | nindent 2 -}}
+	{{- .Values.myappService.ports | toYaml | nindent 2 }}
diff --git a/examples/app/templates/nginx.yaml b/examples/app/templates/nginx.yaml
@@ -11,4 +11,4 @@ spec:
     app: nginx
   {{- include "app.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.nginx.ports | toYaml | nindent 2 -}}
+	{{- .Values.nginx.ports | toYaml | nindent 2 }}
diff --git a/examples/operator/templates/metrics-service.yaml b/examples/operator/templates/metrics-service.yaml
@@ -11,4 +11,4 @@ spec:
     control-plane: controller-manager
   {{- include "operator.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.metricsService.ports | toYaml | nindent 2 -}}
+	{{- .Values.metricsService.ports | toYaml | nindent 2 }}
diff --git a/examples/operator/templates/webhook-service.yaml b/examples/operator/templates/webhook-service.yaml
@@ -10,4 +10,4 @@ spec:
     control-plane: controller-manager
   {{- include "operator.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.webhookService.ports | toYaml | nindent 2 -}}
+	{{- .Values.webhookService.ports | toYaml | nindent 2 }}
diff --git a/pkg/processor/service/service.go b/pkg/processor/service/service.go
@@ -27,7 +27,7 @@ spec:
 %[2]s
   {{- include "%[3]s.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.%[1]s.ports | toYaml | nindent 2 -}}`
+	{{- .Values.%[1]s.ports | toYaml | nindent 2 }}`
 )
 
 var svcGVC = schema.GroupVersionKind{