Merge pull request #1177 from hongkailiu/yamllint

NO-JIRA: make verify

Author: openshift-merge-bot[bot]

Makefile

@@ -19,6 +19,10 @@ format:
 	go fmt ./...
 .PHONY: format
 
+verify:
+	hack/verify-yaml.sh
+.PHONY: verify
+
 clean:
 	rm -rf _output/
 	rm -rf bin

bootstrap/bootstrap-pod.yaml

@@ -11,40 +11,40 @@ spec:
     image: {{.ReleaseImage}}
     imagePullPolicy: Always
     args:
-      - "start"
-      - "--release-image={{.ReleaseImage}}"
-      - "--enable-auto-update=false"
-      - "--listen="
-      - "--v=2"
-      - "--kubeconfig=/etc/kubernetes/kubeconfig"
+    - "start"
+    - "--release-image={{.ReleaseImage}}"
+    - "--enable-auto-update=false"
+    - "--listen="
+    - "--v=2"
+    - "--kubeconfig=/etc/kubernetes/kubeconfig"
     securityContext:
       privileged: true
     terminationMessagePolicy: FallbackToLogsOnError
     volumeMounts:
-      - mountPath: /etc/ssl/certs
-        name: etc-ssl-certs
-        readOnly: true
-      - mountPath: /etc/kubernetes/kubeconfig
-        name: kubeconfig
-        readOnly: true
+    - mountPath: /etc/ssl/certs
+      name: etc-ssl-certs
+      readOnly: true
+    - mountPath: /etc/kubernetes/kubeconfig
+      name: kubeconfig
+      readOnly: true
     env:
-      - name: KUBERNETES_SERVICE_PORT # allows CVO to communicate with apiserver directly on same host.
-        value: "6443"
-      - name: KUBERNETES_SERVICE_HOST # allows CVO to communicate with apiserver directly on same host.
-        value: "127.0.0.1"
-      - name: NODE_NAME
-        valueFrom:
-          fieldRef:
-            fieldPath: spec.nodeName
-      - name: CLUSTER_PROFILE
-        value: {{ .ClusterProfile }}
+    - name: KUBERNETES_SERVICE_PORT  # allows CVO to communicate with apiserver directly on same host.
+      value: "6443"
+    - name: KUBERNETES_SERVICE_HOST  # allows CVO to communicate with apiserver directly on same host.
+      value: "127.0.0.1"
+    - name: NODE_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: spec.nodeName
+    - name: CLUSTER_PROFILE
+      value: {{ .ClusterProfile }}
   dnsPolicy: ClusterFirstWithHostNet
   hostNetwork: true
   terminationGracePeriodSeconds: 130
   volumes:
-    - name: kubeconfig
-      hostPath:
-        path: /etc/kubernetes/kubeconfig
-    - name: etc-ssl-certs
-      hostPath:
-        path: /etc/ssl/certs
+  - name: kubeconfig
+    hostPath:
+      path: /etc/kubernetes/kubeconfig
+  - name: etc-ssl-certs
+    hostPath:
+      path: /etc/ssl/certs

hack/verify-style.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+yamllint -c hack/yamllint-config.yaml -s .

hack/verify-yaml.sh

@@ -3,29 +3,11 @@
 extends: default
 
 rules:
-  braces:
-    level: warning
-    max-spaces-inside: 1
-  brackets:
-    level: warning
-    max-spaces-inside: 1
-  colons:
-    level: warning
-  commas:
-    level: warning
-  comments: disable
-  comments-indentation: disable
   document-start: disable
-  empty-lines:
-    level: warning
-  hyphens:
-    level: warning
+  line-length: disable
   indentation:
-    level: warning
     indent-sequences: consistent
-  line-length: disable
-  truthy: disable
 
-ignore: |
-  # The following have yaml-syntax-breaking templating, but are covered
-  # by other yaml files in the unit tests.
+ignore:
+- vendor/
+- bootstrap/bootstrap-pod.yaml  # it is a go template file