💚 Fix conflicts between formatter and helm template (#350)

* 💚 Fix conflicts between formatter and helm template Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com> * 🤖 Update license headers and formatting go codes Signed-off-by: vdaas-ci <ci@vdaas.org> Co-authored-by: vdaas-ci <ci@vdaas.org>
vdaas · Apr 27, 2020 · e40447f · e40447f
1 parent a82b296
commit e40447f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -42,8 +42,9 @@ jobs:
         run: |
           make helm/docs/vald
           make helm/docs/vald-helm-operator
-      - name: Run license.go
+      - name: Run formatter and license.go
         run: |
+          make format/yaml
           make license
       - name: Push to master
         continue-on-error: true

diff --git a/go.mod b/go.mod
@@ -51,7 +51,7 @@ require (
 	go.opencensus.io v0.22.3
 	go.uber.org/automaxprocs v1.3.0
 	golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9
-	golang.org/x/tools v0.0.0-20200425043458-8463f397d07c // indirect
+	golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b // indirect
 	gonum.org/v1/hdf5 v0.0.0-20191105085658-fe04b73f3b53
 	gonum.org/v1/netlib v0.0.0-20200317120129-c5a04cffd98a // indirect
 	gonum.org/v1/plot v0.7.0

diff --git a/go.sum b/go.sum
@@ -596,6 +596,8 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200425043458-8463f397d07c h1:iHhCR0b26amDCiiO+kBguKZom9aMF+NrFxh9zeKR/XU=
 golang.org/x/tools v0.0.0-20200425043458-8463f397d07c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM=
+golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=

diff --git a/k8s/agent/statefulset.yaml b/k8s/agent/statefulset.yaml
@@ -55,10 +55,10 @@ spec:
             - podAffinityTerm:
                 labelSelector:
                   matchExpressions:
-                  - key: app
-                    operator: In
-                    values:
-                    - vald-agent-ngt
+                    - key: app
+                      operator: In
+                      values:
+                        - vald-agent-ngt
                 topologyKey: kubernetes.io/hostname
               weight: 100
           requiredDuringSchedulingIgnoredDuringExecution: []

diff --git a/k8s/discoverer/deployment.yaml b/k8s/discoverer/deployment.yaml
@@ -54,10 +54,10 @@ spec:
             - podAffinityTerm:
                 labelSelector:
                   matchExpressions:
-                  - key: app
-                    operator: In
-                    values:
-                    - vald-discoverer
+                    - key: app
+                      operator: In
+                      values:
+                        - vald-discoverer
                 topologyKey: kubernetes.io/hostname
               weight: 100
           requiredDuringSchedulingIgnoredDuringExecution: []

diff --git a/k8s/gateway/vald/deployment.yaml b/k8s/gateway/vald/deployment.yaml
@@ -98,10 +98,10 @@ spec:
             - podAffinityTerm:
                 labelSelector:
                   matchExpressions:
-                  - key: app
-                    operator: In
-                    values:
-                    - vald-gateway
+                    - key: app
+                      operator: In
+                      values:
+                        - vald-gateway
                 topologyKey: kubernetes.io/hostname
               weight: 100
           requiredDuringSchedulingIgnoredDuringExecution: []