Merge pull request openshift#12333 from hongkailiu/yamllint

Enable yamllint on clusters folder
vdemeester · Sep 30, 2020 · 92b48e0 · 92b48e0
2 parents 1d0e2fe + f582eb6
commit 92b48e0
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 31 deletions.
diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml
@@ -898,6 +898,7 @@ presubmits:
         - -c
         - services/yamllint/_yamllint.conf
         - ci-operator/jobs
+        - clusters
         - core-services
         command:
         - yamllint

diff --git a/clusters/app.ci/assets/bugzilla-backporter.yaml b/clusters/app.ci/assets/bugzilla-backporter.yaml
@@ -104,4 +104,4 @@ items:
             secretName: bugzilla-credentials-openshift-bugzilla-robot
         - name: plugins
           configMap:
-            name: plugins
+            name: plugins
diff --git a/clusters/app.ci/assets/dptp-controller-manager.yaml b/clusters/app.ci/assets/dptp-controller-manager.yaml
@@ -66,7 +66,6 @@ spec:
     matchNames:
     - ci
 ---
-spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/clusters/app.ci/cert-manager/prow_ingress.yaml b/clusters/app.ci/cert-manager/prow_ingress.yaml
@@ -51,4 +51,4 @@ spec:
         paths:
           - backend:
               serviceName: slack-bot
-              servicePort: 8888
+              servicePort: 8888
diff --git a/clusters/app.ci/prow-monitoring/prometheus-cache.yaml b/clusters/app.ci/prow-monitoring/prometheus-cache.yaml
@@ -74,4 +74,4 @@ items:
       port: 9090
       targetPort: 9090
     selector:
-      app.kubernetes.io/name: querier-cache
+      app.kubernetes.io/name: querier-cache
diff --git a/clusters/app.ci/prow/03_deployment/admin_boskos_rbac.yaml b/clusters/app.ci/prow/03_deployment/admin_boskos_rbac.yaml
@@ -10,7 +10,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name:  boskos
+  name: boskos
   namespace: ci
 rules:
 - apiGroups:

diff --git a/clusters/app.ci/prow/03_deployment/admin_cvp_trigger.yaml b/clusters/app.ci/prow/03_deployment/admin_cvp_trigger.yaml
@@ -31,4 +31,4 @@ rules:
   - create
   - get
   - list
-  - watch
+  - watch
diff --git a/clusters/app.ci/prow/03_deployment/admin_sinker_rbac.yaml b/clusters/app.ci/prow/03_deployment/admin_sinker_rbac.yaml
@@ -15,7 +15,7 @@ items:
         - delete
         - list
         - watch
-        - get        
+        - get
     - apiGroups:
         - ""
       resources:
@@ -31,7 +31,7 @@ items:
         - configmaps
         - events
       verbs:
-        - create        
+        - create
 - kind: RoleBinding
   apiVersion: rbac.authorization.k8s.io/v1
   metadata:

diff --git a/clusters/app.ci/prow/03_deployment/admin_test-credentials.yaml b/clusters/app.ci/prow/03_deployment/admin_test-credentials.yaml
@@ -29,4 +29,4 @@ rules:
   - secrets
   verbs:
   - get
-  - list
+  - list
diff --git a/clusters/app.ci/prow/03_deployment/publicize.yaml b/clusters/app.ci/prow/03_deployment/publicize.yaml
@@ -54,7 +54,7 @@ items:
           volumeMounts:
           - name: config
             mountPath: /etc/config
-            readOnly: true            
+            readOnly: true
           - name: hmac
             mountPath: /etc/webhook
             readOnly: true
@@ -70,7 +70,7 @@ items:
         volumes:
         - name: config
           configMap:
-            name: publicize-config          
+            name: publicize-config
         - name: hmac
           secret:
             secretName: github-webhook-credentials

diff --git a/clusters/build-clusters/01_cluster/assets/admin_default_clusterautoscaler.yaml b/clusters/build-clusters/01_cluster/assets/admin_default_clusterautoscaler.yaml
@@ -15,7 +15,7 @@
 # we do 14 workers per zone and 42 workers in total
 # Limits as Apr. 06 2020
 # IOPS: 1344k =  84 X 16k
-# CPUs: 1600 = 100 X 16 (including 3 masters of 24 CPUs) 
+# CPUs: 1600 = 100 X 16 (including 3 masters of 24 CPUs)
 ---
 apiVersion: "autoscaling.openshift.io/v1"
 kind: "ClusterAutoscaler"

diff --git a/clusters/build-clusters/01_cluster/kubelet/admin_config.yaml b/clusters/build-clusters/01_cluster/kubelet/admin_config.yaml
@@ -1,12 +1,12 @@
 apiVersion: machineconfiguration.openshift.io/v1
 kind: KubeletConfig
 metadata:
-  name: custom-config 
+  name: custom-config
 spec:
   machineConfigPoolSelector:
     matchLabels:
       custom-kubelet: enabled
   kubeletConfig:
     systemReserved:
       cpu: 1000m
-      memory: 3Gi
+      memory: 3Gi
diff --git a/clusters/build-clusters/01_cluster/openshift-console/cluster_console.yaml b/clusters/build-clusters/01_cluster/openshift-console/cluster_console.yaml
@@ -8,5 +8,5 @@ spec:
   managementState: Managed
   route:
     hostname: console.build01.ci.openshift.org
-    secret: 
+    secret:
       name: console-build01-tls
diff --git a/...ers/build-clusters/01_cluster/openshift-monitoring/alertmanager-main_secret_template.yaml b/...ers/build-clusters/01_cluster/openshift-monitoring/alertmanager-main_secret_template.yaml
@@ -8,17 +8,17 @@ objects:
     namespace: ${namespace}
   stringData:
     alertmanager.yaml: |-
-      global: 
+      global:
         resolve_timeout: 5m
-      receivers: 
+      receivers:
         - name: slack-notifications
           slack_configs:
           - api_url: "${slack_api_url}"
             channel: '#ops-testplatform'
             icon_url: https://user-images.githubusercontent.com/4013349/68034370-e85a3d00-fc97-11e9-97e1-ce08d88e7267.png
             text: '{{ template "custom_slack_text" . }}'
-      route: 
-        group_by: 
+      route:
+        group_by:
           - alertname
           - job
         group_interval: 5m
@@ -27,7 +27,7 @@ objects:
         repeat_interval: 12h
         routes:
       templates:
-      - '*.tmpl'  
+      - '*.tmpl'
     msg.tmpl: '{{ define "custom_slack_text" }}{{ .CommonAnnotations.message }}{{ end }}'
   type: Opaque
 parameters:

diff --git a/clusters/build-clusters/01_cluster/openshift/ci-operator/admin_test-credentials.yaml b/clusters/build-clusters/01_cluster/openshift/ci-operator/admin_test-credentials.yaml
@@ -29,4 +29,4 @@ rules:
   - secrets
   verbs:
   - get
-  - list
+  - list
diff --git a/...-clusters/01_cluster/openshift/ci-operator/registry-pull-credentials_secret_template.yaml b/...-clusters/01_cluster/openshift/ci-operator/registry-pull-credentials_secret_template.yaml
@@ -7,7 +7,7 @@ objects:
     annotations:
       openshift.io/description: |
         This secret contains the pull secrets for api.ci cluster and the local registry.
-        It is used to pull images 
+        It is used to pull images
         * by the image clients in ci-operator pod: the local images synced by dptp-controller are eventually consistent only
         * by the build pods created by ci-operator: https://bugzilla.redhat.com/show_bug.cgi?id=1861546
 

diff --git a/clusters/build-clusters/02_cluster/cert-manager/cert-issuer-ci-build-farm_clusterissuer.yaml b/clusters/build-clusters/02_cluster/cert-manager/cert-issuer-ci-build-farm_clusterissuer.yaml
@@ -15,4 +15,3 @@ spec:
           serviceAccountSecretRef:
             name: cert-issuer
             key: openshift-ci-build-farm-cert-issuer.json
-
diff --git a/clusters/build-clusters/02_cluster/openshift-console/cluster_console.yaml b/clusters/build-clusters/02_cluster/openshift-console/cluster_console.yaml
@@ -8,5 +8,5 @@ spec:
   managementState: Managed
   route:
     hostname: console.build02.ci.openshift.org
-    secret: 
+    secret:
       name: console-build02-tls
diff --git a/...ers/build-clusters/02_cluster/openshift-monitoring/alertmanager-main_secret_template.yaml b/...ers/build-clusters/02_cluster/openshift-monitoring/alertmanager-main_secret_template.yaml
@@ -8,17 +8,17 @@ objects:
     namespace: ${namespace}
   stringData:
     alertmanager.yaml: |-
-      global: 
+      global:
         resolve_timeout: 5m
-      receivers: 
+      receivers:
         - name: slack-notifications
           slack_configs:
           - api_url: "${slack_api_url}"
             channel: '#ops-testplatform'
             icon_url: https://user-images.githubusercontent.com/4013349/82943538-cb54c680-9f67-11ea-888c-6d1e7a4da10d.png
             text: '{{ template "custom_slack_text" . }}'
-      route: 
-        group_by: 
+      route:
+        group_by:
           - alertname
           - job
         group_interval: 5m
@@ -27,7 +27,7 @@ objects:
         repeat_interval: 12h
         routes:
       templates:
-      - '*.tmpl'  
+      - '*.tmpl'
     msg.tmpl: '{{ define "custom_slack_text" }}{{ .CommonAnnotations.message }}{{ end }}'
   type: Opaque
 parameters:

diff --git a/clusters/build-clusters/02_cluster/openshift/ci-operator/admin_test-credentials.yaml b/clusters/build-clusters/02_cluster/openshift/ci-operator/admin_test-credentials.yaml
@@ -29,4 +29,4 @@ rules:
   - secrets
   verbs:
   - get
-  - list
+  - list
diff --git a/...-clusters/02_cluster/openshift/ci-operator/registry-pull-credentials_secret_template.yaml b/...-clusters/02_cluster/openshift/ci-operator/registry-pull-credentials_secret_template.yaml
@@ -7,7 +7,7 @@ objects:
     annotations:
       openshift.io/description: |
         This secret contains the pull secrets for api.ci cluster and the local registry.
-        It is used to pull images 
+        It is used to pull images
         * by the image clients in ci-operator pod: the local images synced by dptp-controller are eventually consistent only
         * by the build pods created by ci-operator: https://bugzilla.redhat.com/show_bug.cgi?id=1861546