chore: fix helm lint issues

SAP · Mar 9, 2023 · ff5c1c2 · ff5c1c2
1 parent a5a5a17
commit ff5c1c2
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 22 deletions.
diff --git a/deploy/cluster-status/templates/deployment.yaml b/deploy/cluster-status/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-cluster-status

diff --git a/deploy/infrabox/Chart.yaml b/deploy/infrabox/Chart.yaml
@@ -1,3 +1,4 @@
 name: infrabox
-version: 1
+version: "1"
+apiVersion: v2
 
diff --git a/deploy/infrabox/templates/api/deployment.yaml b/deploy/infrabox/templates/api/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-api
@@ -7,6 +7,9 @@ metadata:
         app: infrabox-api
 spec:
     replicas: {{ default 1 .Values.api.replicas }}
+    selector:
+        matchLabels:
+            app: infrabox-api
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/checker/deployment.yaml b/deploy/infrabox/templates/checker/deployment.yaml
@@ -1,5 +1,5 @@
 {{ if or .Values.ha.enabled .Values.monitoring.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-checker
@@ -8,6 +8,9 @@ metadata:
         app: infrabox-checker
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-checker
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/docker-registry/deployment.yaml b/deploy/infrabox/templates/docker-registry/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-docker-registry
@@ -7,6 +7,9 @@ metadata:
         app: infrabox-docker-registry
 spec:
     replicas: {{ required "docker_registry.replicas is required" .Values.docker_registry.replicas }}
+    selector:
+        matchLabels:
+            app: infrabox-docker-registry
     template:
         metadata:
             labels:
@@ -50,7 +53,7 @@ spec:
                     value: "true"
                 -
                     name: REGISTRY_HTTP_SECRET
-                    value: {{ .Values.admin.private_key | sha256sum }}
+                    value: {{ required ".Values.admin.private_key is required" .Values.admin.private_key | sha256sum }}
                 {{ if .Values.storage.s3.enabled }}
                 -
                     name: REGISTRY_STORAGE

diff --git a/deploy/infrabox/templates/fluentbit/daemonset.yaml b/deploy/infrabox/templates/fluentbit/daemonset.yaml
@@ -1,11 +1,14 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: infrabox-fluent-bit
   namespace: {{ template "system_namespace" . }}
   labels:
     app: infrabox-fluent-bit
 spec:
+  selector:
+    matchLabels:
+      app: infrabox-fluent-bit
   template:
     metadata:
       labels:

diff --git a/deploy/infrabox/templates/gc/deployment.yaml b/deploy/infrabox/templates/gc/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-gc
@@ -7,6 +7,9 @@ metadata:
         app: infrabox-gc
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-gc
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/gerrit/review.yaml b/deploy/infrabox/templates/gerrit/review.yaml
@@ -1,6 +1,6 @@
 {{ define "gerrit_review_deployment" }}
 {{ if .Values.gerrit.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-gerrit-review
@@ -9,6 +9,9 @@ metadata:
         app: infrabox-gerrit-review
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-gerrit-review
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/gerrit/trigger.yaml b/deploy/infrabox/templates/gerrit/trigger.yaml
@@ -1,6 +1,6 @@
 {{ define "gerrit_trigger_deployment" }}
 {{ if .Values.gerrit.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-gerrit-trigger
@@ -9,6 +9,9 @@ metadata:
         app: infrabox-gerrit-trigger
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-gerrit-trigger
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/github/deployment.yaml b/deploy/infrabox/templates/github/deployment.yaml
@@ -1,6 +1,6 @@
 {{ define "github_deployment" }}
 {{ if .Values.github.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-github
@@ -9,6 +9,9 @@ metadata:
         app: infrabox-github
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-github
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/grafana/deployment.yaml b/deploy/infrabox/templates/grafana/deployment.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.monitoring.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-grafana
@@ -8,6 +8,9 @@ metadata:
         app: infrabox-grafana
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-grafana
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/ingress.yaml b/deploy/infrabox/templates/ingress.yaml
@@ -37,7 +37,7 @@
 
 
 {{ if .Values.ingress.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
     name: infrabox

diff --git a/deploy/infrabox/templates/ingress_ha.yaml b/deploy/infrabox/templates/ingress_ha.yaml
@@ -1,6 +1,6 @@
 {{ if .Values.ingress.enabled }}
 {{ if .Values.ha.enabled}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
     name: infrabox-ha-entry

diff --git a/deploy/infrabox/templates/metrics/deployment.yaml b/deploy/infrabox/templates/metrics/deployment.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.monitoring.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-metrics
@@ -8,6 +8,9 @@ metadata:
         app: infrabox-metrics
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-metrics
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/rbac.yaml b/deploy/infrabox/templates/rbac.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ template "system_namespace" . }}
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: infrabox-{{ .Values.cluster.name }}
   namespace: {{ template "system_namespace" . }}

diff --git a/deploy/infrabox/templates/scheduler/deployment.yaml b/deploy/infrabox/templates/scheduler/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-scheduler
@@ -7,6 +7,9 @@ metadata:
         app: infrabox-scheduler
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-scheduler
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/static/deployment.yaml b/deploy/infrabox/templates/static/deployment.yaml
@@ -1,5 +1,5 @@
 {{ define "static_deployment" }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-static
@@ -8,6 +8,9 @@ metadata:
         app: infrabox-static
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-static
     template:
         metadata:
             labels:

diff --git a/deploy/infrabox/templates/status-cachet/deployment.yaml b/deploy/infrabox/templates/status-cachet/deployment.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.cachet.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: infrabox-status-cachet
@@ -8,6 +8,9 @@ metadata:
         app: infrabox-status-cachet
 spec:
     replicas: 1
+    selector:
+        matchLabels:
+            app: infrabox-status-cachet
     template:
         metadata:
             labels:

diff --git a/src/services/aks/infrabox-service-aks/templates/deployment.yaml b/src/services/aks/infrabox-service-aks/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "infrabox-service-aks.fullname" . }}

diff --git a/src/services/gardener/infrabox-service-garden/templates/deployment.yaml b/src/services/gardener/infrabox-service-garden/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "infrabox-service-gardener.fullname" . }}

diff --git a/src/services/namespace/infrabox-service-namespace/templates/deployment.yaml b/src/services/namespace/infrabox-service-namespace/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "infrabox-service-namespace.fullname" . }}