addressing PR comments

Signed-off-by: Ido Heyvi <[email protected]>
k8snetworkplumbingwg · Oct 15, 2024 · 663ad6b · 663ad6b
1 parent 4ab7a6f
commit 663ad6b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/bindata/manifests/operator-webhook/002-rbac.yaml b/bindata/manifests/operator-webhook/002-rbac.yaml
@@ -10,7 +10,7 @@ kind: ClusterRole
 metadata:
   name: operator-webhook
   labels:
-    created-by: {{ include "sriov-network-operator.fullname" . }}
+    created-by: {{ .OperatorGeneratedResourcesLabelSelector | default "sriov-network-operator" }}
 rules:
 - apiGroups:
     - ""
@@ -35,7 +35,7 @@ kind: ClusterRoleBinding
 metadata:
   name: operator-webhook-role-binding
   labels:
-    created-by: {{ include "sriov-network-operator.fullname" . }}  
+    created-by: {{ .OperatorGeneratedResourcesLabelSelector | default "sriov-network-operator" }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/bindata/manifests/operator-webhook/003-webhook.yaml b/bindata/manifests/operator-webhook/003-webhook.yaml
@@ -12,7 +12,7 @@ metadata:
     cert-manager.io/inject-ca-from: {{.Namespace}}/{{.OperatorWebhookSecretName}}
     {{- end }}
   labels:
-    created-by: {{ include "sriov-network-operator.fullname" . }}    
+    created-by: {{ .OperatorGeneratedResourcesLabelSelector | default "sriov-network-operator" }}   
 webhooks:
   - name: operator-webhook.sriovnetwork.openshift.io
     sideEffects: None
@@ -46,7 +46,7 @@ metadata:
     cert-manager.io/inject-ca-from: {{.Namespace}}/{{.OperatorWebhookSecretName}}
     {{- end }}
   labels:
-    created-by: {{ include "sriov-network-operator.fullname" . }}    
+    created-by: {{ .OperatorGeneratedResourcesLabelSelector | default "sriov-network-operator" }}   
 webhooks:
   - name: operator-webhook.sriovnetwork.openshift.io
     sideEffects: None

diff --git a/bindata/manifests/webhook/002-rbac.yaml b/bindata/manifests/webhook/002-rbac.yaml
@@ -10,7 +10,7 @@ kind: ClusterRole
 metadata:
   name: network-resources-injector
   labels:
-    created-by: {{ include "sriov-network-operator.fullname" . }} 
+    created-by: {{ .OperatorGeneratedResourcesLabelSelector | default "sriov-network-operator" }}
 rules:
 - apiGroups:
     - k8s.cni.cncf.io
@@ -34,7 +34,7 @@ kind: ClusterRoleBinding
 metadata:
   name: network-resources-injector-role-binding
   labels:
-    created-by: {{ include "sriov-network-operator.fullname" . }}  
+    created-by: {{ .OperatorGeneratedResourcesLabelSelector | default "sriov-network-operator" }} 
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/bindata/manifests/webhook/003-webhook.yaml b/bindata/manifests/webhook/003-webhook.yaml
@@ -12,7 +12,7 @@ metadata:
     cert-manager.io/inject-ca-from: {{.Namespace}}/{{.InjectorWebhookSecretName}}
     {{- end }}
   labels:
-    created-by: {{ include "sriov-network-operator.fullname" . }}    
+    created-by: {{ .OperatorGeneratedResourcesLabelSelector | default "sriov-network-operator" }}   
 webhooks:
   - name: network-resources-injector-config.k8s.io
     sideEffects: None

diff --git a/controllers/sriovoperatorconfig_controller.go b/controllers/sriovoperatorconfig_controller.go
@@ -300,6 +300,7 @@ func (r *SriovOperatorConfigReconciler) syncWebhookObjs(ctx context.Context, dc
 		data.Data["OperatorWebhookCA"] = os.Getenv("ADMISSION_CONTROLLERS_CERTIFICATES_OPERATOR_CA_CRT")
 		data.Data["InjectorWebhookSecretName"] = os.Getenv("ADMISSION_CONTROLLERS_CERTIFICATES_INJECTOR_SECRET_NAME")
 		data.Data["InjectorWebhookCA"] = os.Getenv("ADMISSION_CONTROLLERS_CERTIFICATES_INJECTOR_CA_CRT")
+		data.Data["OperatorGeneratedResourcesLabelSelector"] = os.Getenv("OPERATOR_GENERATED_RESOURCES_LABEL_SELECTOR")
 
 		data.Data["ExternalControlPlane"] = false
 		if r.PlatformHelper.IsOpenshiftCluster() {

diff --git a/deployment/sriov-network-operator-chart/templates/pre-delete-webooks.yaml b/deployment/sriov-network-operator-chart/templates/pre-delete-webooks.yaml
@@ -1,4 +1,3 @@
-{{ if .Values.operator.admissionControllers.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -22,5 +21,4 @@ spec:
             - {{ .Release.Namespace }}
             - --label-selector
             - "created-by={{ include "sriov-network-operator.fullname" . }}"
-      restartPolicy: Never
-{{ end }}      
+      restartPolicy: Never