update

Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com>

Author: danilrwx

templates/cdi/cdi-apiserver/vpa.yaml

@@ -3,20 +3,20 @@
 apiVersion: autoscaling.k8s.io/v1
 kind: VerticalPodAutoscaler
 metadata:
-  name: cdi-apiserver
+  name: d8-cdi-apiserver
   namespace: d8-{{ .Chart.Name }}
-  {{- include "helm_lib_module_labels" (list . (dict "app" "cdi-apiserver" )) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app" "d8-cdi-apiserver" )) | nindent 2 }}
 spec:
   targetRef:
     apiVersion: "apps/v1"
     kind: Deployment
-    name: cdi-apiserver
+    name: d8-cdi-apiserver
   updatePolicy:
     updateMode: "Auto"
   resourcePolicy:
     containerPolicies:
     {{- include "kube_api_rewriter.vpa_container_policy" . | nindent 4 }}
-    - containerName: cdi-apiserver
+    - containerName: d8-cdi-apiserver
       minAllowed:
         cpu: 10m
         memory: 20Mi

templates/cdi/cdi-deployment/rbac-for-us.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: d8:{{ .Chart.Name }}:cdi-deployment-rbac-proxy
-  {{- include "helm_lib_module_labels" (list . (dict "app" "cdi-deployment")) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app" "d8-cdi-deployment")) | nindent 2 }}
 subjects:
   - kind: ServiceAccount
     name: d8-cdi-sa

templates/cdi/cdi-deployment/vpa.yaml

@@ -3,20 +3,20 @@
 apiVersion: autoscaling.k8s.io/v1
 kind: VerticalPodAutoscaler
 metadata:
-  name: cdi-deployment
+  name: d8-cdi-deployment
   namespace: d8-{{ .Chart.Name }}
-  {{- include "helm_lib_module_labels" (list . (dict "app" "cdi-deployment" )) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app" "d8-cdi-deployment" )) | nindent 2 }}
 spec:
   targetRef:
     apiVersion: "apps/v1"
     kind: Deployment
-    name: cdi-deployment
+    name: d8-cdi-deployment
   updatePolicy:
     updateMode: "Auto"
   resourcePolicy:
     containerPolicies:
     {{- include "kube_api_rewriter.vpa_container_policy" . | nindent 4 }}
-    - containerName: cdi-deployment
+    - containerName: d8-cdi-deployment
       minAllowed:
         cpu: 10m
         memory: 30Mi

templates/cdi/cdi-operator/configmap.yaml

@@ -2,6 +2,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: cdi-operator-leader-election-helper
+  name: d8-cdi-operator-leader-election-helper
   namespace: d8-{{ .Chart.Name }}
   {{- include "helm_lib_module_labels" (list .) | nindent 2 }}

templates/cdi/cdi-operator/rbac-for-us.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   {{- include "helm_lib_module_labels" (list .) | nindent 2 }}
-  name: d8:containerized-data-importer:d8-cdi-operator
+  name: d8:containerized-data-importer:cdi-operator
 rules:
 - apiGroups:
     - rbac.authorization.k8s.io
@@ -314,11 +314,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   {{- include "helm_lib_module_labels" (list .) | nindent 2 }}
-  name: d8:containerized-data-importer:d8-cdi-operator
+  name: d8:containerized-data-importer:cdi-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: d8:containerized-data-importer:d8-cdi-operator
+  name: d8:containerized-data-importer:cdi-operator
 subjects:
 - kind: ServiceAccount
   name: d8-cdi-operator

templates/cdi/config.yaml

@@ -36,39 +36,39 @@ spec:
         metrics_address: 127.0.0.1:8080
     patches:
       - resourceType: Deployment
-        resourceName: cdi-apiserver
+        resourceName: d8-cdi-apiserver
         patch: '[{"op":"replace","path":"/spec/template/spec/nodeSelector","value":{{ $nodeSelectorMaster }}}]'
         type: json
       - resourceType: Deployment
-        resourceName: cdi-apiserver
+        resourceName: d8-cdi-apiserver
         patch: '[{"op":"replace","path":"/spec/template/spec/tolerations","value":{{ $tolerationsAnyNode }}}]'
         type: json
 
     {{- if (include "helm_lib_ha_enabled" .) }}
       # HA settings for deploy/cdi-apiserver.
       - resourceType: Deployment
-        resourceName: cdi-apiserver
+        resourceName: d8-cdi-apiserver
         patch: '[{"op":"replace","path":"/spec/replicas","value":3}]'
         type: json
       - resourceType: Deployment
-        resourceName: cdi-apiserver
-        patch: {{ include "spec_template_spec_antiaffinity_patch" (list "cdi.kubevirt.io" "cdi-apiserver") }}
+        resourceName: d8-cdi-apiserver
+        patch: {{ include "spec_template_spec_antiaffinity_patch" (list "cdi.kubevirt.io" "d8-cdi-apiserver") }}
         type: strategic
       - resourceType: Deployment
-        resourceName: cdi-apiserver
+        resourceName: d8-cdi-apiserver
         patch: {{ include "spec_strategy_rolling_update_patch" . }}
         type: strategic
       # HA settings for deploy/cdi-deployment.
       - resourceType: Deployment
-        resourceName: cdi-deployment
+        resourceName: d8-cdi-deployment
         patch: '[{"op":"replace","path":"/spec/replicas","value":2}]'
         type: json
       - resourceType: Deployment
-        resourceName: cdi-deployment
-        patch: {{ include "spec_template_spec_antiaffinity_patch" (list "cdi.kubevirt.io" "cdi-deployment") }}
+        resourceName: d8-cdi-deployment
+        patch: {{ include "spec_template_spec_antiaffinity_patch" (list "cdi.kubevirt.io" "d8-cdi-deployment") }}
         type: strategic
       - resourceType: Deployment
-        resourceName: cdi-deployment
+        resourceName: d8-cdi-deployment
         patch: {{ include "spec_strategy_rolling_update_patch" . }}
         type: strategic
     {{- end }}
@@ -82,13 +82,13 @@ spec:
       {{- $_ := set $apiRewriterSettings "webhookCertsVolumeName" "server-cert" }}
       {{- $_ := set $apiRewriterSettings "webhookCertsMountPath" "/var/run/certs/cdi-apiserver-server-cert" }}
       - resourceType: Deployment
-        resourceName: cdi-apiserver
+        resourceName: d8-cdi-apiserver
         patch: {{ include "kube_api_rewriter.pod_spec_strategic_patch_json" (tuple . "cdi-apiserver" $apiRewriterSettings) }}
         type: strategic
 
       - resourceType: Deployment
-        resourceName: cdi-deployment
-        patch: {{ include "kube_api_rewriter.pod_spec_strategic_patch_json" (tuple . "cdi-deployment") }}
+        resourceName: d8-cdi-deployment
+        patch: {{ include "kube_api_rewriter.pod_spec_strategic_patch_json" (tuple . "d8-cdi-deployment") }}
         type: strategic
 
       # Add kube-rbac-proxy as a sidecar container to cdi-apiserver and cdi-deployment.
@@ -102,34 +102,34 @@ spec:
           (dict "upstream" "http://127.0.0.1:9090/readyz" "path" "/proxy/readyz" "name" "kube-api-rewriter")
       ) }}
       - resourceType: Deployment
-        resourceName: cdi-apiserver
+        resourceName: d8-cdi-apiserver
         patch: {{ include "kube_rbac_proxy.pod_spec_strategic_patch_json" (tuple . $kubeRbacProxySettings) }}
         type: strategic
 
       {{- $_ := set $kubeRbacProxySettings "ignorePaths" "/proxy/healthz,/proxy/readyz" }}
       {{- $_ := set $kubeRbacProxySettings "upstreams" (list
           (dict "upstream" "http://127.0.0.1:9090/metrics" "path" "/proxy/metrics" "name" "kube-api-rewriter")
-          (dict "upstream" "http://127.0.0.1:8080/metrics" "path" "/metrics" "name" "cdi-deployment")
+          (dict "upstream" "http://127.0.0.1:8080/metrics" "path" "/metrics" "name" "d8-cdi-deployment")
           (dict "upstream" "http://127.0.0.1:9090/healthz" "path" "/proxy/healthz" "name" "kube-api-rewriter")
           (dict "upstream" "http://127.0.0.1:9090/readyz" "path" "/proxy/readyz" "name" "kube-api-rewriter")
       ) }}
       - resourceType: Deployment
-        resourceName: cdi-deployment
+        resourceName: d8-cdi-deployment
         patch: {{ include "kube_rbac_proxy.pod_spec_strategic_patch_json" (tuple . $kubeRbacProxySettings) }}
         type: strategic
       - resourceType: Service
-        resourceName: cdi-prometheus-metrics
+        resourceName: d8-cdi-prometheus-metrics
         patch: '[{"op": "replace", "path": "/spec/ports/0/targetPort", "value": "https-metrics"}]'
         type: json
 
       # Add rewriter proxy container port to the Service used by webhook configurations.
       # First need to set name for existing port to make strategic patch works later.
-      - resourceName: cdi-api
+      - resourceName: d8-cdi-api
         resourceType: Service
         patch: |
           [{"op":"replace", "path":"/spec/ports/0/name", "value":"https"}]
         type: json
-      - resourceName: cdi-api
+      - resourceName: d8-cdi-api
         resourceType: Service
         patch: {{ include "kube_api_rewriter.service_spec_port_patch_json" . }}
         type: strategic