Merge branch 'main' of https://github.com/ContainerCraft/helm into re…

…leases
ContainerCraft · Jan 2, 2022 · 0f28b08 · 0f28b08
2 parents 446c395 + b628333
commit 0f28b08
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/charts/hostpath-provisioner/Chart.yaml b/charts/hostpath-provisioner/Chart.yaml
@@ -1,4 +1,4 @@
-version: 0.0.3
+version: 0.0.4
 apiVersion: v2
 name: hostpath-provisioner
 description: Kubevirt Hostpath Provisioner Operatore Helm Chart

diff --git a/charts/hostpath-provisioner/templates/hostpathprovisioner.yaml b/charts/hostpath-provisioner/templates/hostpathprovisioner.yaml
@@ -2,12 +2,16 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: hostpath-provisioner-operator
+  name: {{ include "hostpath-provisioner.serviceAccountName" . }}
+  labels:
+{{ include "hostpath-provisioner.labels" . | indent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: hostpath-provisioner-operator
+  labels:
+{{ include "hostpath-provisioner.labels" . | indent 4 }}
 rules:
   - apiGroups:
       - apps
@@ -44,9 +48,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: hostpath-provisioner-operator
+  labels:
+{{ include "hostpath-provisioner.labels" . | indent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: hostpath-provisioner-operator
+    name: {{ include "hostpath-provisioner.serviceAccountName" . }}
     namespace: hostpath-provisioner
 roleRef:
   kind: ClusterRole
@@ -57,9 +63,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: hostpath-provisioner-operator
+  labels:
+{{ include "hostpath-provisioner.labels" . | indent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: hostpath-provisioner-operator
+    name: {{ include "hostpath-provisioner.serviceAccountName" . }}
     namespace: hostpath-provisioner
 roleRef:
   kind: Role
@@ -70,6 +78,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hostpath-provisioner-operator
+  labels:
+{{ include "hostpath-provisioner.labels" . | indent 4 }}
 spec:
   replicas: 1
   selector:
@@ -80,7 +90,7 @@ spec:
       labels:
         name: hostpath-provisioner-operator
     spec:
-      serviceAccountName: hostpath-provisioner-operator
+      serviceAccountName: {{ include "hostpath-provisioner.serviceAccountName" . }}
       containers:
         - name: hostpath-provisioner-operator
           # Replace this with the built image name

diff --git a/charts/hostpath-provisioner/templates/hostpathprovisioner_cr.yaml b/charts/hostpath-provisioner/templates/hostpathprovisioner_cr.yaml
@@ -2,6 +2,8 @@ apiVersion: hostpathprovisioner.kubevirt.io/v1beta1
 kind: HostPathProvisioner
 metadata:
   name: hostpath-provisioner
+  labels:
+{{ include "hostpath-provisioner.labels" . | indent 4 }}
 spec:
   imagePullPolicy: IfNotPresent
   pathConfig:

diff --git a/charts/hostpath-provisioner/templates/storageclass-wffc.yaml b/charts/hostpath-provisioner/templates/storageclass-wffc.yaml
@@ -2,6 +2,8 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: hostpath-provisioner
+  labels:
+{{ include "hostpath-provisioner.labels" . | indent 4 }}
 provisioner: kubevirt.io/hostpath-provisioner
 reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
diff --git a/charts/kargo/crds/cdi-operator.yaml b/charts/kargo/crds/cdi-operator.yaml
@@ -3596,25 +3596,25 @@ spec:
         - name: DEPLOY_CLUSTER_RESOURCES
           value: "true"
         - name: OPERATOR_VERSION
-          value: v1.42.0
+          value: v1.42.1
         - name: CONTROLLER_IMAGE
-          value: quay.io/kubevirt/cdi-controller:v1.42.0
+          value: quay.io/kubevirt/cdi-controller:v1.42.1
         - name: IMPORTER_IMAGE
-          value: quay.io/kubevirt/cdi-importer:v1.42.0
+          value: quay.io/kubevirt/cdi-importer:v1.42.1
         - name: CLONER_IMAGE
-          value: quay.io/kubevirt/cdi-cloner:v1.42.0
+          value: quay.io/kubevirt/cdi-cloner:v1.42.1
         - name: APISERVER_IMAGE
-          value: quay.io/kubevirt/cdi-apiserver:v1.42.0
+          value: quay.io/kubevirt/cdi-apiserver:v1.42.1
         - name: UPLOAD_SERVER_IMAGE
-          value: quay.io/kubevirt/cdi-uploadserver:v1.42.0
+          value: quay.io/kubevirt/cdi-uploadserver:v1.42.1
         - name: UPLOAD_PROXY_IMAGE
-          value: quay.io/kubevirt/cdi-uploadproxy:v1.42.0
+          value: quay.io/kubevirt/cdi-uploadproxy:v1.42.1
         - name: VERBOSITY
           value: "1"
         - name: PULL_POLICY
           value: IfNotPresent
         - name: MONITORING_NAMESPACE
-        image: quay.io/kubevirt/cdi-operator:v1.42.0
+        image: quay.io/kubevirt/cdi-operator:v1.42.1
         imagePullPolicy: IfNotPresent
         name: cdi-operator
         ports: