From dfb32ccf60b5e853d1868b74111cbe006c1b2c59 Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Tue, 16 Jun 2020 19:55:47 -0500 Subject: [PATCH] Enable yamllint rules for templates - braces - brackets - colons - commas - comments - comments-indentation - document-start - hyphens - indentation With corresponding code changes. Also idempotency fix for lint script. Change-Id: Ibe5281cbb4ad7970e92f3d1f921abb1efc89dc3b --- calico/templates/daemonset-calico-node.yaml | 4 +- .../deployment-calico-kube-controllers.yaml | 2 +- ceph-client/templates/cronjob-defragosds.yaml | 4 +- .../templates/deployment-checkdns.yaml | 2 +- ceph-client/templates/deployment-mds.yaml | 14 +++--- ceph-client/templates/deployment-mgr.yaml | 24 ++++----- ceph-mon/templates/daemonset-mon.yaml | 32 ++++++------ ceph-mon/templates/job-keyring.yaml | 2 +- .../templates/job-storage-admin-keys.yaml | 2 +- .../templates/job-cephfs-client-key.yaml | 2 +- .../configmap-etc-elasticsearch.yaml | 2 +- elasticsearch/templates/statefulset-data.yaml | 2 +- .../templates/daemonset-kube-flannel-ds.yaml | 4 +- fluentd/templates/service-fluentd.yaml | 2 +- kibana/templates/configmap-etc.yaml | 2 +- .../templates/pod-test.yaml | 2 +- ldap/templates/service.yaml | 2 +- ldap/templates/statefulset.yaml | 4 +- mariadb/templates/pod-test.yaml | 2 +- mariadb/templates/statefulset.yaml | 2 +- memcached/templates/deployment.yaml | 4 +- mongodb/templates/service.yaml | 2 +- mongodb/templates/statefulset.yaml | 2 +- nagios/templates/configmap-etc.yaml | 2 +- .../templates/podsecuritypolicy.yaml | 2 +- postgresql/templates/secrets-etc.yaml | 1 - postgresql/templates/service-restapi.yaml | 2 +- postgresql/templates/statefulset.yaml | 2 +- .../templates/daemonset.yaml | 6 +-- .../templates/daemonset.yaml | 2 +- prometheus/templates/configmap-etc.yaml | 2 +- rabbitmq/templates/statefulset.yaml | 6 +-- registry/templates/pvc-images.yaml | 2 +- tools/gate/lint.sh | 2 +- yamllint-templates.conf | 49 ++++++------------- 35 files changed, 90 insertions(+), 108 deletions(-) diff --git a/calico/templates/daemonset-calico-node.yaml b/calico/templates/daemonset-calico-node.yaml index 76da61359..cb0deba52 100644 --- a/calico/templates/daemonset-calico-node.yaml +++ b/calico/templates/daemonset-calico-node.yaml @@ -71,9 +71,9 @@ rules: - namespaces verbs: - get - - apiGroups: ["batch" ] + - apiGroups: ["batch"] resources: ["jobs"] - verbs: ["get" ] + verbs: ["get"] --- # This manifest installs the calico/node container, as well # as the Calico CNI plugins and network config on diff --git a/calico/templates/deployment-calico-kube-controllers.yaml b/calico/templates/deployment-calico-kube-controllers.yaml index 76df0cb77..8deb9a872 100644 --- a/calico/templates/deployment-calico-kube-controllers.yaml +++ b/calico/templates/deployment-calico-kube-controllers.yaml @@ -126,8 +126,8 @@ spec: # conf.controllers expanded values {{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.conf.controllers | indent 12 }} - # etcd tls files {{ if .Values.endpoints.etcd.auth.client.tls.ca }} + # etcd tls files - name: ETCD_CA_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.ca }} {{ end }} diff --git a/ceph-client/templates/cronjob-defragosds.yaml b/ceph-client/templates/cronjob-defragosds.yaml index 87f4b2b66..f536dc805 100644 --- a/ceph-client/templates/cronjob-defragosds.yaml +++ b/ceph-client/templates/cronjob-defragosds.yaml @@ -83,7 +83,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: KUBECTL_PARAM - value: {{ tuple $envAll "ceph" "ceph-defragosd" | include "helm-toolkit.snippets.kubernetes_kubectl_params" | indent 10 }} + value: {{ tuple $envAll "ceph" "ceph-defragosd" | include "helm-toolkit.snippets.kubernetes_kubectl_params" }} command: - /tmp/utils-defragOSDs.sh - cron @@ -105,6 +105,6 @@ spec: emptyDir: {} - name: ceph-client-bin configMap: - name: ceph-client-bin + name: ceph-client-bin defaultMode: 0555 {{- end }} diff --git a/ceph-client/templates/deployment-checkdns.yaml b/ceph-client/templates/deployment-checkdns.yaml index e629168af..25b056cea 100644 --- a/ceph-client/templates/deployment-checkdns.yaml +++ b/ceph-client/templates/deployment-checkdns.yaml @@ -99,7 +99,7 @@ spec: - name: MON_PORT_V2 value: {{ tuple "ceph_mon" "internal" "mon_msgr2" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} - name: KUBECTL_PARAM - value: {{ tuple $envAll "ceph" "checkdns" | include "helm-toolkit.snippets.kubernetes_kubectl_params" | indent 10 }} + value: {{ tuple $envAll "ceph" "checkdns" | include "helm-toolkit.snippets.kubernetes_kubectl_params" }} command: - /tmp/_start.sh volumeMounts: diff --git a/ceph-client/templates/deployment-mds.yaml b/ceph-client/templates/deployment-mds.yaml index 0a624ea78..84838b55a 100644 --- a/ceph-client/templates/deployment-mds.yaml +++ b/ceph-client/templates/deployment-mds.yaml @@ -98,14 +98,14 @@ spec: ports: - containerPort: 6800 livenessProbe: - tcpSocket: - port: 6800 - initialDelaySeconds: 60 - timeoutSeconds: 5 + tcpSocket: + port: 6800 + initialDelaySeconds: 60 + timeoutSeconds: 5 readinessProbe: - tcpSocket: - port: 6800 - timeoutSeconds: 5 + tcpSocket: + port: 6800 + timeoutSeconds: 5 volumeMounts: - name: pod-tmp mountPath: /tmp diff --git a/ceph-client/templates/deployment-mgr.yaml b/ceph-client/templates/deployment-mgr.yaml index 5bdd7cbbd..13fbfe0c5 100644 --- a/ceph-client/templates/deployment-mgr.yaml +++ b/ceph-client/templates/deployment-mgr.yaml @@ -118,19 +118,19 @@ spec: containerPort: {{ tuple "ceph_mgr" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{ end -}} livenessProbe: - exec: - command: - - /tmp/mgr-check.sh - - liveness - initialDelaySeconds: 30 - timeoutSeconds: 5 + exec: + command: + - /tmp/mgr-check.sh + - liveness + initialDelaySeconds: 30 + timeoutSeconds: 5 readinessProbe: - exec: - command: - - /tmp/mgr-check.sh - - readiness - initialDelaySeconds: 30 - timeoutSeconds: 5 + exec: + command: + - /tmp/mgr-check.sh + - readiness + initialDelaySeconds: 30 + timeoutSeconds: 5 volumeMounts: - name: pod-tmp mountPath: /tmp diff --git a/ceph-mon/templates/daemonset-mon.yaml b/ceph-mon/templates/daemonset-mon.yaml index 7296ed2cd..d1048db3d 100644 --- a/ceph-mon/templates/daemonset-mon.yaml +++ b/ceph-mon/templates/daemonset-mon.yaml @@ -136,7 +136,7 @@ spec: - name: CEPH_PUBLIC_NETWORK value: {{ .Values.network.public | quote }} - name: KUBECTL_PARAM - value: {{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_kubectl_params" | indent 10 }} + value: {{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_kubectl_params" }} - name: MON_PORT value: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} - name: MON_PORT_V2 @@ -157,26 +157,26 @@ spec: - /tmp/mon-start.sh lifecycle: preStop: - exec: - command: - - /tmp/mon-stop.sh + exec: + command: + - /tmp/mon-stop.sh ports: - containerPort: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - containerPort: {{ tuple "ceph_mon" "internal" "mon_msgr2" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }} livenessProbe: - exec: - command: - - /tmp/mon-check.sh - - liveness - initialDelaySeconds: 360 - periodSeconds: 180 + exec: + command: + - /tmp/mon-check.sh + - liveness + initialDelaySeconds: 360 + periodSeconds: 180 readinessProbe: - exec: - command: - - /tmp/mon-check.sh - - readiness - initialDelaySeconds: 60 - periodSeconds: 60 + exec: + command: + - /tmp/mon-check.sh + - readiness + initialDelaySeconds: 60 + periodSeconds: 60 volumeMounts: - name: pod-tmp mountPath: /tmp diff --git a/ceph-mon/templates/job-keyring.yaml b/ceph-mon/templates/job-keyring.yaml index 833c1f151..e27ff5300 100644 --- a/ceph-mon/templates/job-keyring.yaml +++ b/ceph-mon/templates/job-keyring.yaml @@ -68,7 +68,7 @@ spec: initContainers: {{ tuple $envAll "job_keyring_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - - name: {{ $jobName }} + - name: {{ $jobName }} {{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "ceph" "container" "$jobName" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} diff --git a/ceph-mon/templates/job-storage-admin-keys.yaml b/ceph-mon/templates/job-storage-admin-keys.yaml index d7b4b3be3..77fdcd378 100644 --- a/ceph-mon/templates/job-storage-admin-keys.yaml +++ b/ceph-mon/templates/job-storage-admin-keys.yaml @@ -70,7 +70,7 @@ spec: initContainers: {{ tuple $envAll "storage_keys_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - - name: ceph-storage-keys-generator + - name: ceph-storage-keys-generator {{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "storage_keys_generator" "container" "ceph_storage_keys_generator" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} diff --git a/ceph-provisioners/templates/job-cephfs-client-key.yaml b/ceph-provisioners/templates/job-cephfs-client-key.yaml index 2118fdac1..36ca2a505 100644 --- a/ceph-provisioners/templates/job-cephfs-client-key.yaml +++ b/ceph-provisioners/templates/job-cephfs-client-key.yaml @@ -98,7 +98,7 @@ spec: initContainers: {{ tuple $envAll "cephfs_client_key_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - - name: ceph-storage-keys-generator + - name: ceph-storage-keys-generator {{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "cephfs_client_key_generator" "container" "ceph_storage_keys_generator" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} diff --git a/elasticsearch/templates/configmap-etc-elasticsearch.yaml b/elasticsearch/templates/configmap-etc-elasticsearch.yaml index 2826bc709..b70a8ceee 100644 --- a/elasticsearch/templates/configmap-etc-elasticsearch.yaml +++ b/elasticsearch/templates/configmap-etc-elasticsearch.yaml @@ -36,7 +36,7 @@ metadata: type: Opaque data: elasticsearch.yml: {{ toYaml .Values.conf.elasticsearch.config | b64enc }} -#NOTE(portdirect): this must be last, to work round helm ~2.7 bug. + # NOTE(portdirect): this must be last, to work round helm ~2.7 bug. {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.httpd "key" "httpd.conf" "format" "Secret") | indent 2 }} {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.log4j2 "key" "log4j2.properties" "format" "Secret") | indent 2 }} {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.jvm_options "key" "jvm.options" "format" "Secret") | indent 2 }} diff --git a/elasticsearch/templates/statefulset-data.yaml b/elasticsearch/templates/statefulset-data.yaml index 048d9fae3..ac5f769c0 100644 --- a/elasticsearch/templates/statefulset-data.yaml +++ b/elasticsearch/templates/statefulset-data.yaml @@ -103,7 +103,7 @@ spec: - name: NODE_NAME valueFrom: fieldRef: - fieldPath: metadata.name + fieldPath: metadata.name - name: ELASTICSEARCH_USERNAME valueFrom: secretKeyRef: diff --git a/flannel/templates/daemonset-kube-flannel-ds.yaml b/flannel/templates/daemonset-kube-flannel-ds.yaml index 96188defd..b9085511d 100644 --- a/flannel/templates/daemonset-kube-flannel-ds.yaml +++ b/flannel/templates/daemonset-kube-flannel-ds.yaml @@ -97,7 +97,7 @@ spec: {{ tuple $envAll "flannel" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: privileged: true - command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ] + command: ["/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr"] env: - name: POD_NAME valueFrom: @@ -116,7 +116,7 @@ spec: mountPath: /etc/kube-flannel/ - name: install-cni image: {{ .Values.images.tags.flannel }} - command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ] + command: ["/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done"] volumeMounts: - name: pod-tmp mountPath: /tmp diff --git a/fluentd/templates/service-fluentd.yaml b/fluentd/templates/service-fluentd.yaml index 4eb0ec51e..6d75de3ea 100644 --- a/fluentd/templates/service-fluentd.yaml +++ b/fluentd/templates/service-fluentd.yaml @@ -22,7 +22,7 @@ metadata: spec: ports: - name: forward - port: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{ if .Values.network.fluentd.node_port.enabled }} nodePort: {{ .Values.network.fluentd.node_port.port }} {{ end }} diff --git a/kibana/templates/configmap-etc.yaml b/kibana/templates/configmap-etc.yaml index 1a26ca9ac..6a9a07e91 100644 --- a/kibana/templates/configmap-etc.yaml +++ b/kibana/templates/configmap-etc.yaml @@ -22,6 +22,6 @@ metadata: type: Opaque data: kibana.yml: {{ toYaml .Values.conf.kibana | b64enc }} -#NOTE(portdirect): this must be last, to work round helm ~2.7 bug. + # NOTE(portdirect): this must be last, to work round helm ~2.7 bug. {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.httpd "key" "httpd.conf" "format" "Secret") | indent 2 }} {{- end }} diff --git a/kubernetes-keystone-webhook/templates/pod-test.yaml b/kubernetes-keystone-webhook/templates/pod-test.yaml index 89002f7c4..98f685555 100644 --- a/kubernetes-keystone-webhook/templates/pod-test.yaml +++ b/kubernetes-keystone-webhook/templates/pod-test.yaml @@ -33,7 +33,7 @@ spec: {{ $envAll.Values.labels.test.node_selector_key }}: {{ $envAll.Values.labels.test.node_selector_value | quote }} restartPolicy: Never initContainers: -{{ tuple $envAll "tests" $mounts_kubernetes_keystone_webhook_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +{{ tuple $envAll "tests" $mounts_kubernetes_keystone_webhook_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{ $envAll.Release.Name }}-kubernetes-keystone-webhook-test {{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }} diff --git a/ldap/templates/service.yaml b/ldap/templates/service.yaml index ebc0ac453..244f60ecc 100644 --- a/ldap/templates/service.yaml +++ b/ldap/templates/service.yaml @@ -24,5 +24,5 @@ spec: - name: ldap port: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} selector: -{{ tuple $envAll "ldap" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} +{{ tuple $envAll "ldap" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{- end }} diff --git a/ldap/templates/statefulset.yaml b/ldap/templates/statefulset.yaml index 21be78c11..848154de5 100644 --- a/ldap/templates/statefulset.yaml +++ b/ldap/templates/statefulset.yaml @@ -81,7 +81,7 @@ spec: - metadata: name: ldap-data spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] storageClassName: {{ .Values.storage.pvc.class_name }} resources: requests: @@ -89,7 +89,7 @@ spec: - metadata: name: ldap-config spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] storageClassName: {{ .Values.storage.pvc.class_name }} resources: requests: diff --git a/mariadb/templates/pod-test.yaml b/mariadb/templates/pod-test.yaml index 20ece6e27..687caa028 100644 --- a/mariadb/templates/pod-test.yaml +++ b/mariadb/templates/pod-test.yaml @@ -37,7 +37,7 @@ spec: {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} restartPolicy: Never initContainers: -{{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +{{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: mariadb-test {{ dict "envAll" $envAll "application" "tests" "container" "test" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }} diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index 39c689c83..70255b597 100644 --- a/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml @@ -263,7 +263,7 @@ spec: - metadata: name: mysql-data spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] resources: requests: storage: {{ .Values.volume.size }} diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index bfbc5a392..1b4e20277 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -15,8 +15,8 @@ limitations under the License. {{- if .Values.manifests.deployment }} {{- $envAll := . }} -{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "memcached" }} -{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }} +{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "memcached" }} +{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }} {{ tuple $envAll "memcached" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- diff --git a/mongodb/templates/service.yaml b/mongodb/templates/service.yaml index dea6784fb..5b2a9d54b 100644 --- a/mongodb/templates/service.yaml +++ b/mongodb/templates/service.yaml @@ -24,5 +24,5 @@ spec: - name: db port: {{ tuple "mongodb" "internal" "mongodb" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} selector: -{{ tuple $envAll "mongodb" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} +{{ tuple $envAll "mongodb" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{- end }} diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml index fc5c6547d..e5e0b48df 100644 --- a/mongodb/templates/statefulset.yaml +++ b/mongodb/templates/statefulset.yaml @@ -130,7 +130,7 @@ spec: annotations: {{ .Values.volume.class_path }}: {{ .Values.volume.class_name }} spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] resources: requests: storage: {{ .Values.volume.size }} diff --git a/nagios/templates/configmap-etc.yaml b/nagios/templates/configmap-etc.yaml index 55f32d772..28ef873d9 100644 --- a/nagios/templates/configmap-etc.yaml +++ b/nagios/templates/configmap-etc.yaml @@ -30,6 +30,6 @@ data: {{- $objectFile := printf "%s.cfg" $objectType -}} {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" $config.template "key" $objectFile "format" "Secret") | indent 2 }} {{- end }} -#NOTE(portdirect): this must be last, to work round helm ~2.7 bug. + # NOTE(portdirect): this must be last, to work round helm ~2.7 bug. {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.httpd "key" "httpd.conf" "format" "Secret") | indent 2 }} {{- end }} diff --git a/podsecuritypolicy/templates/podsecuritypolicy.yaml b/podsecuritypolicy/templates/podsecuritypolicy.yaml index 38b0ac87f..c12d5f385 100644 --- a/podsecuritypolicy/templates/podsecuritypolicy.yaml +++ b/podsecuritypolicy/templates/podsecuritypolicy.yaml @@ -43,7 +43,7 @@ metadata: rules: - apiGroups: ['policy'] resources: ['podsecuritypolicies'] - verbs: ['use'] + verbs: ['use'] resourceNames: - {{ $pspName }} {{- end }} diff --git a/postgresql/templates/secrets-etc.yaml b/postgresql/templates/secrets-etc.yaml index 7b4671804..0fc295e02 100644 --- a/postgresql/templates/secrets-etc.yaml +++ b/postgresql/templates/secrets-etc.yaml @@ -23,4 +23,3 @@ type: Opaque data: admin_user.conf: {{ tuple "secrets/_admin_user.conf.tpl" . | include "helm-toolkit.utils.template" | b64enc }} {{- end }} - diff --git a/postgresql/templates/service-restapi.yaml b/postgresql/templates/service-restapi.yaml index b133d66ef..3b7a8fe48 100644 --- a/postgresql/templates/service-restapi.yaml +++ b/postgresql/templates/service-restapi.yaml @@ -24,5 +24,5 @@ spec: - name: restapi port: {{ tuple "postgresql-restapi" "internal" "restapi" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} selector: -{{ tuple $envAll "postgresql" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} +{{ tuple $envAll "postgresql" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{- end }} diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml index 31fb65b82..7c049d82d 100644 --- a/postgresql/templates/statefulset.yaml +++ b/postgresql/templates/statefulset.yaml @@ -448,7 +448,7 @@ spec: annotations: {{ .Values.storage.pvc.class_path }}: {{ .Values.storage.pvc.class_name }} spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] resources: requests: storage: {{ .Values.storage.pvc.size }} diff --git a/prometheus-node-exporter/templates/daemonset.yaml b/prometheus-node-exporter/templates/daemonset.yaml index f5d0f9a89..e37cf892c 100644 --- a/prometheus-node-exporter/templates/daemonset.yaml +++ b/prometheus-node-exporter/templates/daemonset.yaml @@ -88,14 +88,14 @@ spec: mountPath: /tmp - name: proc mountPath: /host/proc - readOnly: true + readOnly: true - name: sys mountPath: /host/sys - readOnly: true + readOnly: true {{ if .Values.conf.collectors.textfile.directory }} - name: stats-out mountPath: {{.Values.conf.collectors.textfile.directory }} - readOnly: true + readOnly: true {{ end }} - name: node-exporter-bin mountPath: /tmp/node-exporter.sh diff --git a/prometheus-process-exporter/templates/daemonset.yaml b/prometheus-process-exporter/templates/daemonset.yaml index bbf1d067a..71f9334cb 100644 --- a/prometheus-process-exporter/templates/daemonset.yaml +++ b/prometheus-process-exporter/templates/daemonset.yaml @@ -89,7 +89,7 @@ spec: mountPath: /tmp - name: proc mountPath: /host/proc - readOnly: true + readOnly: true volumes: - name: pod-tmp emptyDir: {} diff --git a/prometheus/templates/configmap-etc.yaml b/prometheus/templates/configmap-etc.yaml index f0747e88f..b5e36191b 100644 --- a/prometheus/templates/configmap-etc.yaml +++ b/prometheus/templates/configmap-etc.yaml @@ -25,6 +25,6 @@ data: {{ range $key, $value := .Values.conf.prometheus.rules }} {{ $key }}.rules: {{ toYaml $value | b64enc }} {{ end }} -#NOTE(srwilkers): this must be last, to work round helm ~2.7 bug. + # NOTE(srwilkers): this must be last, to work round helm ~2.7 bug. {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.httpd "key" "httpd.conf" "format" "Secret") | indent 2 }} {{- end }} diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml index 99f5d3e8c..11af505d6 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -25,14 +25,14 @@ limitations under the License. {{- if regexMatch "^[0-9]*m$" $val -}} {{- $val = div (float64 (trimSuffix "m" $val)) 1000 -}} {{- end -}} -{{/* NOTE(aostapenko) String with floating number does not convert well to int*/}} +{{/* NOTE(aostapenko) String with floating number does not convert well to int */}} {{- $val | float64 | int | default 1 -}} {{- end -}} {{- if .Values.manifests.statefulset }} {{- $envAll := . }} -{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq" }} +{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq" }} {{ tuple $envAll "rabbitmq" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -277,7 +277,7 @@ spec: - metadata: name: rabbitmq-data spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] resources: requests: storage: {{ $envAll.Values.volume.size }} diff --git a/registry/templates/pvc-images.yaml b/registry/templates/pvc-images.yaml index 8cf2f7345..dcdd49a06 100644 --- a/registry/templates/pvc-images.yaml +++ b/registry/templates/pvc-images.yaml @@ -20,7 +20,7 @@ apiVersion: v1 metadata: name: docker-images spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] resources: requests: storage: {{ .Values.volume.size }} diff --git a/tools/gate/lint.sh b/tools/gate/lint.sh index d429d78f3..3d5f57d2d 100755 --- a/tools/gate/lint.sh +++ b/tools/gate/lint.sh @@ -7,10 +7,10 @@ HELM_VERSION=$(yq -r '.version.helm' ${HELM_DATA_YAML}) GOOGLE_HELM_REPO_URL=$(yq -r '.url.google_helm_repo' ${HELM_DATA_YAML}) LINT_DIR=.yamllint +rm -rf */charts/helm-toolkit mkdir ${LINT_DIR} cp -r * ${LINT_DIR} rm -rf ${LINT_DIR}/*/templates -rm -rf */charts/helm-toolkit wget -qO ${LINT_DIR}/helm.tgz ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz tar xzf ${LINT_DIR}/helm.tgz -C ${LINT_DIR} --strip-components=1 linux-amd64/helm diff --git a/yamllint-templates.conf b/yamllint-templates.conf index c356561e1..12d5bc41a 100644 --- a/yamllint-templates.conf +++ b/yamllint-templates.conf @@ -6,44 +6,27 @@ yaml-files: - '.yamllint' rules: - braces: - level: warning - brackets: - level: warning - colons: - level: warning - commas: - level: warning - comments: - level: warning - comments-indentation: - level: warning + braces: enable + brackets: enable + colons: enable + commas: enable + comments: enable + comments-indentation: enable document-end: disable - document-start: - level: warning - empty-lines: - level: warning - empty-values: - level: warning - hyphens: - level: warning + document-start: enable + empty-lines: disable + empty-values: disable + hyphens: enable indentation: spaces: 2 indent-sequences: whatever - level: warning - key-duplicates: - level: warning + key-duplicates: disable key-ordering: disable line-length: disable - new-line-at-end-of-file: - level: warning - new-lines: - level: warning - octal-values: - level: warning + new-line-at-end-of-file: disable + new-lines: disable + octal-values: disable quoted-strings: disable - trailing-spaces: - level: warning - truthy: - level: warning + trailing-spaces: disable + truthy: disable ...