From aeda024986e336ac679955d61757676d36f99292 Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Tue, 27 Jun 2023 03:19:45 +0300 Subject: [PATCH] :zap: Remove the unnecessary single quotes from the Helm templates --- helm-chart/templates/00-namespace.yaml | 2 +- helm-chart/templates/01-service-account.yaml | 2 +- helm-chart/templates/02-cluster-role.yaml | 2 +- helm-chart/templates/03-cluster-role-binding.yaml | 4 ++-- helm-chart/templates/04-hub-pod.yaml | 14 +++++++------- helm-chart/templates/05-hub-service.yaml | 2 +- helm-chart/templates/06-front-pod.yaml | 4 ++-- helm-chart/templates/07-front-service.yaml | 2 +- .../templates/08-persistent-volume-claim.yaml | 6 +++--- helm-chart/templates/09-worker-daemon-set.yaml | 12 ++++++------ helm-chart/templates/10-ingress-class.yaml | 2 +- helm-chart/templates/11-ingress.yaml | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/helm-chart/templates/00-namespace.yaml b/helm-chart/templates/00-namespace.yaml index ef53eed88..33af952fe 100644 --- a/helm-chart/templates/00-namespace.yaml +++ b/helm-chart/templates/00-namespace.yaml @@ -7,6 +7,6 @@ metadata: {{- if .Values.tap.resourcelabels }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} - name: '{{ .Values.tap.selfnamespace }}' + name: {{ .Values.tap.selfnamespace }} spec: {} status: {} diff --git a/helm-chart/templates/01-service-account.yaml b/helm-chart/templates/01-service-account.yaml index ebea7d0b2..94c5c73c4 100644 --- a/helm-chart/templates/01-service-account.yaml +++ b/helm-chart/templates/01-service-account.yaml @@ -8,4 +8,4 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-service-account - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} diff --git a/helm-chart/templates/02-cluster-role.yaml b/helm-chart/templates/02-cluster-role.yaml index 1438d899c..00be62e59 100644 --- a/helm-chart/templates/02-cluster-role.yaml +++ b/helm-chart/templates/02-cluster-role.yaml @@ -8,7 +8,7 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-cluster-role - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} rules: - apiGroups: - "" diff --git a/helm-chart/templates/03-cluster-role-binding.yaml b/helm-chart/templates/03-cluster-role-binding.yaml index 6e018a35e..6dd0fb4f3 100644 --- a/helm-chart/templates/03-cluster-role-binding.yaml +++ b/helm-chart/templates/03-cluster-role-binding.yaml @@ -8,7 +8,7 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-cluster-role-binding - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -16,4 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: kubeshark-service-account - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} diff --git a/helm-chart/templates/04-hub-pod.yaml b/helm-chart/templates/04-hub-pod.yaml index 9fbbf329c..8994a530c 100644 --- a/helm-chart/templates/04-hub-pod.yaml +++ b/helm-chart/templates/04-hub-pod.yaml @@ -9,11 +9,11 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-hub - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: containers: - command: - - '{{ .Values.tap.debug | ternary "./hub -debug" "./hub" }}' + - {{ .Values.tap.debug | ternary "./hub -debug" "./hub" }} env: - name: POD_REGEX value: '{{ .Values.tap.regex }}' @@ -28,18 +28,18 @@ spec: - name: AUTH_APPROVED_DOMAINS value: '{{ gt (len .Values.tap.ingress.auth.approvedDomains) 0 | ternary (join "," .Values.tap.ingress.auth.approvedDomains) "" }}' image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.tag }}' - imagePullPolicy: '{{ .Values.tap.docker.imagepullpolicy }}' + imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }} name: kubeshark-hub ports: - containerPort: 80 hostPort: {{ .Values.tap.proxy.hub.srvport }} resources: limits: - cpu: '{{ .Values.tap.resources.hub.limits.cpu }}' - memory: '{{ .Values.tap.resources.hub.limits.memory }}' + cpu: {{ .Values.tap.resources.hub.limits.cpu }} + memory: {{ .Values.tap.resources.hub.limits.memory }} requests: - cpu: '{{ .Values.tap.resources.hub.requests.cpu }}' - memory: '{{ .Values.tap.resources.hub.requests.memory }}' + cpu: {{ .Values.tap.resources.hub.requests.cpu }} + memory: {{ .Values.tap.resources.hub.requests.memory }} dnsPolicy: ClusterFirstWithHostNet serviceAccountName: kubeshark-service-account terminationGracePeriodSeconds: 0 diff --git a/helm-chart/templates/05-hub-service.yaml b/helm-chart/templates/05-hub-service.yaml index c9d34a918..d6daa1c7e 100644 --- a/helm-chart/templates/05-hub-service.yaml +++ b/helm-chart/templates/05-hub-service.yaml @@ -8,7 +8,7 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-hub - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: ports: - name: kubeshark-hub diff --git a/helm-chart/templates/06-front-pod.yaml b/helm-chart/templates/06-front-pod.yaml index 2cbe5365d..419436930 100644 --- a/helm-chart/templates/06-front-pod.yaml +++ b/helm-chart/templates/06-front-pod.yaml @@ -9,7 +9,7 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-front - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: containers: - env: @@ -20,7 +20,7 @@ spec: - name: REACT_APP_HUB_PORT value: '{{ .Values.tap.ingress.enabled | ternary "80/api" "8898" }}' image: '{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.tag }}' - imagePullPolicy: '{{ .Values.tap.docker.imagepullpolicy }}' + imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }} name: kubeshark-front ports: - containerPort: 80 diff --git a/helm-chart/templates/07-front-service.yaml b/helm-chart/templates/07-front-service.yaml index 44721970c..3811470e7 100644 --- a/helm-chart/templates/07-front-service.yaml +++ b/helm-chart/templates/07-front-service.yaml @@ -8,7 +8,7 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-front - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: ports: - name: kubeshark-front diff --git a/helm-chart/templates/08-persistent-volume-claim.yaml b/helm-chart/templates/08-persistent-volume-claim.yaml index aeccf46a5..ef1ac9029 100644 --- a/helm-chart/templates/08-persistent-volume-claim.yaml +++ b/helm-chart/templates/08-persistent-volume-claim.yaml @@ -9,13 +9,13 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-persistent-volume-claim - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: accessModes: - ReadWriteMany resources: requests: - storage: '{{ .Values.tap.storagelimit }}' - storageClassName: '{{ .Values.tap.storageclass }}' + storage: {{ .Values.tap.storagelimit }} + storageClassName: {{ .Values.tap.storageclass }} status: {} {{- end }} diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml index 4d14ff7b1..f0227033a 100644 --- a/helm-chart/templates/09-worker-daemon-set.yaml +++ b/helm-chart/templates/09-worker-daemon-set.yaml @@ -9,7 +9,7 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-worker-daemon-set - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: selector: matchLabels: @@ -42,18 +42,18 @@ spec: - -procfs - /hostproc image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.tag }}' - imagePullPolicy: '{{ .Values.tap.docker.imagepullpolicy }}' + imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }} name: kubeshark-worker-daemon-set ports: - containerPort: {{ .Values.tap.proxy.worker.srvport }} hostPort: {{ .Values.tap.proxy.worker.srvport }} resources: limits: - cpu: '{{ .Values.tap.resources.worker.limits.cpu }}' - memory: '{{ .Values.tap.resources.worker.limits.memory }}' + cpu: {{ .Values.tap.resources.worker.limits.cpu }} + memory: {{ .Values.tap.resources.worker.limits.memory }} requests: - cpu: '{{ .Values.tap.resources.worker.requests.cpu }}' - memory: '{{ .Values.tap.resources.worker.requests.memory }}' + cpu: {{ .Values.tap.resources.worker.requests.cpu }} + memory: {{ .Values.tap.resources.worker.requests.memory }} securityContext: capabilities: add: diff --git a/helm-chart/templates/10-ingress-class.yaml b/helm-chart/templates/10-ingress-class.yaml index d1da9d68d..c1f511980 100644 --- a/helm-chart/templates/10-ingress-class.yaml +++ b/helm-chart/templates/10-ingress-class.yaml @@ -9,7 +9,7 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-ingress-class - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: controller: k8s.io/ingress-nginx {{- end }} diff --git a/helm-chart/templates/11-ingress.yaml b/helm-chart/templates/11-ingress.yaml index 04428e57e..006835784 100644 --- a/helm-chart/templates/11-ingress.yaml +++ b/helm-chart/templates/11-ingress.yaml @@ -12,11 +12,11 @@ metadata: {{- toYaml .Values.tap.resourcelabels | nindent 4 }} {{- end }} name: kubeshark-ingress - namespace: '{{ .Values.tap.selfnamespace }}' + namespace: {{ .Values.tap.selfnamespace }} spec: ingressClassName: kubeshark-ingress-class rules: - - host: '{{ .Values.tap.ingress.host }}' + - host: {{ .Values.tap.ingress.host }} http: paths: - backend: