From e6738a53a8c0b14b341e152a8565109f6d008e89 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Wed, 3 Jan 2024 17:03:36 +0100 Subject: [PATCH] style: format code --- .yamllint.yaml | 3 +++ .../charts/backend/templates/deployment.yaml | 4 ++-- .../common/charts/backend/templates/service.yaml | 2 +- .../charts/frontend/templates/deployment.yaml | 4 ++-- .../common/charts/frontend/templates/ingress.yaml | 6 +++--- .../common/charts/frontend/templates/service.yaml | 2 +- _examples/helloworld/squadron.yaml | 2 +- .../squadrons/checkout/backend/squadron.yaml | 10 +++++----- .../squadrons/checkout/frontend/squadron.yaml | 14 +++++++------- _examples/monorepo/squadrons/squadron.yaml | 4 ++-- .../squadrons/storefinder/backend/squadron.yaml | 10 +++++----- .../squadrons/storefinder/frontend/squadron.yaml | 14 +++++++------- 12 files changed, 39 insertions(+), 36 deletions(-) diff --git a/.yamllint.yaml b/.yamllint.yaml index 669c864..3b31050 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -3,3 +3,6 @@ extends: default rules: line-length: disable document-start: disable + quoted-strings: + quote-type: single + required: false diff --git a/_examples/common/charts/backend/templates/deployment.yaml b/_examples/common/charts/backend/templates/deployment.yaml index 3937b4b..b9fa4b8 100644 --- a/_examples/common/charts/backend/templates/deployment.yaml +++ b/_examples/common/charts/backend/templates/deployment.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/component: {{ .Chart.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}' namespace: {{ .Release.Namespace }} spec: selector: @@ -21,7 +21,7 @@ spec: spec: containers: - name: {{ .Release.Name }} - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' ports: - name: http protocol: TCP diff --git a/_examples/common/charts/backend/templates/service.yaml b/_examples/common/charts/backend/templates/service.yaml index 5d76459..8961e7a 100644 --- a/_examples/common/charts/backend/templates/service.yaml +++ b/_examples/common/charts/backend/templates/service.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/component: {{ .Chart.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}' namespace: {{ .Release.Namespace }} spec: type: ClusterIP diff --git a/_examples/common/charts/frontend/templates/deployment.yaml b/_examples/common/charts/frontend/templates/deployment.yaml index 3937b4b..b9fa4b8 100644 --- a/_examples/common/charts/frontend/templates/deployment.yaml +++ b/_examples/common/charts/frontend/templates/deployment.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/component: {{ .Chart.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}' namespace: {{ .Release.Namespace }} spec: selector: @@ -21,7 +21,7 @@ spec: spec: containers: - name: {{ .Release.Name }} - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' ports: - name: http protocol: TCP diff --git a/_examples/common/charts/frontend/templates/ingress.yaml b/_examples/common/charts/frontend/templates/ingress.yaml index 746a9f8..c0ab328 100644 --- a/_examples/common/charts/frontend/templates/ingress.yaml +++ b/_examples/common/charts/frontend/templates/ingress.yaml @@ -6,14 +6,14 @@ metadata: app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/component: {{ .Chart.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}' namespace: {{ .Release.Namespace }} spec: tls: - - hosts: [ "foo.com" ] + - hosts: ['foo.com'] secretName: foo-com-cert rules: - - host: foo.com + - host: foo.com http: paths: - pathType: Prefix diff --git a/_examples/common/charts/frontend/templates/service.yaml b/_examples/common/charts/frontend/templates/service.yaml index 5d76459..8961e7a 100644 --- a/_examples/common/charts/frontend/templates/service.yaml +++ b/_examples/common/charts/frontend/templates/service.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/component: {{ .Chart.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}' namespace: {{ .Release.Namespace }} spec: type: ClusterIP diff --git a/_examples/helloworld/squadron.yaml b/_examples/helloworld/squadron.yaml index 2a096fb..5e975fd 100644 --- a/_examples/helloworld/squadron.yaml +++ b/_examples/helloworld/squadron.yaml @@ -1,4 +1,4 @@ -version: "2.0" +version: '2.0' squadron: storefinder: diff --git a/_examples/monorepo/squadrons/checkout/backend/squadron.yaml b/_examples/monorepo/squadrons/checkout/backend/squadron.yaml index a1bf711..2883852 100644 --- a/_examples/monorepo/squadrons/checkout/backend/squadron.yaml +++ b/_examples/monorepo/squadrons/checkout/backend/squadron.yaml @@ -1,21 +1,21 @@ # Schema version -version: "2.0" +version: '2.0' squadron: checkout: backend: chart: <% env "PROJECT_ROOT" %>/../common/charts/backend - tags: [ "backend" ] + tags: ['backend'] builds: default: tag: <% .Global.docker.tag | quote %> image: <% .Global.docker.registry %>/checkout-backend context: <% env "PROJECT_ROOT" %>/squadrons/checkout/backend dockerfile: <% env "PROJECT_ROOT" %>/../common/docker/backend.Dockerfile - dependencies: [ "backend-base" ] + dependencies: ['backend-base'] args: - - "BASE_IMAGE=<% .Global.docker.registry %>/backend-base" - - "BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>" + - 'BASE_IMAGE=<% .Global.docker.registry %>/backend-base' + - 'BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>' values: image: tag: <% .Global.docker.tag | quote %> diff --git a/_examples/monorepo/squadrons/checkout/frontend/squadron.yaml b/_examples/monorepo/squadrons/checkout/frontend/squadron.yaml index 00cd478..aceb400 100644 --- a/_examples/monorepo/squadrons/checkout/frontend/squadron.yaml +++ b/_examples/monorepo/squadrons/checkout/frontend/squadron.yaml @@ -1,22 +1,22 @@ # Schema version -version: "2.0" +version: '2.0' squadron: checkout: frontend: chart: <% env "PROJECT_ROOT" %>/../common/charts/frontend - tags: [ "frontend" ] + tags: ['frontend'] builds: default: - tag: "<% .Global.docker.tag %>" + tag: <% .Global.docker.tag | quote %> image: <% .Global.docker.registry %>/checkout-frontend context: <% env "PROJECT_ROOT" %>/squadrons/checkout/frontend dockerfile: <% env "PROJECT_ROOT" %>/../common/docker/frontend.Dockerfile - dependencies: [ "frontend-base" ] + dependencies: ['frontend-base'] args: - - "BASE_IMAGE=<% .Global.docker.registry %>/frontend-base" - - "BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>" + - 'BASE_IMAGE=<% .Global.docker.registry %>/frontend-base' + - 'BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>' values: image: - tag: "<% .Global.docker.tag %>" + tag: <% .Global.docker.tag | quote %> repository: <% .Squadron.checkout.frontend.builds.default.image %> diff --git a/_examples/monorepo/squadrons/squadron.yaml b/_examples/monorepo/squadrons/squadron.yaml index 3e901c0..167215f 100644 --- a/_examples/monorepo/squadrons/squadron.yaml +++ b/_examples/monorepo/squadrons/squadron.yaml @@ -1,8 +1,8 @@ -version: "2.0" +version: '2.0' global: docker: - tag: "230101.0" + tag: '230101.0' registry: monorepo builds: diff --git a/_examples/monorepo/squadrons/storefinder/backend/squadron.yaml b/_examples/monorepo/squadrons/storefinder/backend/squadron.yaml index 391448c..bfe4059 100644 --- a/_examples/monorepo/squadrons/storefinder/backend/squadron.yaml +++ b/_examples/monorepo/squadrons/storefinder/backend/squadron.yaml @@ -1,21 +1,21 @@ # Schema version -version: "2.0" +version: '2.0' squadron: storefinder: backend: chart: <% env "PROJECT_ROOT" %>/../common/charts/backend - tags: [ "backend" ] + tags: ['backend'] builds: default: tag: <% .Global.docker.tag | quote %> image: <% .Global.docker.registry %>/storefinder-backend context: <% env "PROJECT_ROOT" %>/squadrons/storefinder/backend dockerfile: <% env "PROJECT_ROOT" %>/../common/docker/backend.Dockerfile - dependencies: [ "backend-base" ] + dependencies: ['backend-base'] args: - - "BASE_IMAGE=<% .Global.docker.registry %>/backend-base" - - "BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>" + - 'BASE_IMAGE=<% .Global.docker.registry %>/backend-base' + - 'BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>' values: image: tag: <% .Global.docker.tag | quote %> diff --git a/_examples/monorepo/squadrons/storefinder/frontend/squadron.yaml b/_examples/monorepo/squadrons/storefinder/frontend/squadron.yaml index e6018ef..5ffa94b 100644 --- a/_examples/monorepo/squadrons/storefinder/frontend/squadron.yaml +++ b/_examples/monorepo/squadrons/storefinder/frontend/squadron.yaml @@ -1,22 +1,22 @@ # Schema version -version: "2.0" +version: '2.0' squadron: storefinder: frontend: chart: <% env "PROJECT_ROOT" %>/../common/charts/frontend - tags: [ "frontend" ] + tags: ['frontend'] builds: default: - tag: "<% .Global.docker.tag %>" + tag: <% .Global.docker.tag | quote %> image: <% .Global.docker.registry %>/storefinder-frontend context: <% env "PROJECT_ROOT" %>/squadrons/storefinder/frontend dockerfile: <% env "PROJECT_ROOT" %>/../common/docker/frontend.Dockerfile - dependencies: [ "frontend-base" ] + dependencies: ['frontend-base'] args: - - "BASE_IMAGE=<% .Global.docker.registry %>/frontend-base" - - "BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>" + - 'BASE_IMAGE=<% .Global.docker.registry %>/frontend-base' + - 'BASE_IMAGE_TAG=<% .Global.docker.tag | quote %>' values: image: - tag: "<% .Global.docker.tag %>" + tag: <% .Global.docker.tag | quote %> repository: <% .Squadron.storefinder.frontend.builds.default.image %>