minor fixes

Author: t0mmylam

chart/templates/deploymentpolicy-crd.yaml

@@ -1,10 +1,22 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
+  name: deploymentpolicies.skyhook.nvidia.com
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-  name: deploymentpolicies.skyhook.nvidia.com
+  labels:
+  {{- include "chart.labels" . | nindent 4 }}
 spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: skyhook-operator-webhook-service
+          namespace: '{{ .Release.Namespace }}'
+          path: /convert
+      conversionReviewVersions:
+      - v1
   group: skyhook.nvidia.com
   names:
     kind: DeploymentPolicy

chart/templates/mutating-webhook.yaml

@@ -32,4 +32,32 @@ webhooks:
     scope: '*'
   sideEffects: None
   timeoutSeconds: 10
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    caBundle: ""
+    service:
+      name: skyhook-operator-webhook-service
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-skyhook-nvidia-com-v1alpha1-deploymentpolicy
+      port: 443
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: mutate-deploymentpolicy.nvidia.com
+  namespaceSelector: {}
+  objectSelector: {}
+  reinvocationPolicy: Never
+  rules:
+  - apiGroups:
+    - skyhook.nvidia.com
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - deploymentpolicies
+    scope: '*'
+  sideEffects: None
+  timeoutSeconds: 10
 {{- end }}

chart/templates/validating-webhook.yaml

@@ -31,4 +31,31 @@ webhooks:
     scope: '*'
   sideEffects: None
   timeoutSeconds: 10
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    caBundle: ""
+    service:
+      name: skyhook-operator-webhook-service
+      namespace: {{ .Release.Namespace }}
+      path: /validate-skyhook-nvidia-com-v1alpha1-deploymentpolicy
+      port: 443
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validate-deploymentpolicy.nvidia.com
+  namespaceSelector: {}
+  objectSelector: {}
+  rules:
+  - apiGroups:
+    - skyhook.nvidia.com
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - deploymentpolicies
+    scope: '*'
+  sideEffects: None
+  timeoutSeconds: 10
 {{- end }}

operator/api/v1alpha1/deployment_policy_webhook.go

@@ -46,12 +46,12 @@ func (r *DeploymentPolicy) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 //+kubebuilder:webhook:path=/mutate-skyhook-nvidia-com-v1alpha1-deploymentpolicy,mutating=true,failurePolicy=fail,sideEffects=None,groups=skyhook.nvidia.com,resources=deploymentpolicies,verbs=create;update,versions=v1alpha1,name=mdeploymentpolicy.kb.io,admissionReviewVersions=v1
 
-// SkyhookWebhook handles validation and defaulting for Skyhook resources
+// DeploymentPolicyWebhook handles validation and defaulting for DeploymentPolicy resources
 // +kubebuilder:object:generate=false
 type DeploymentPolicyWebhook struct {
 }
 
-var _ admission.CustomDefaulter = &SkyhookWebhook{}
+var _ admission.CustomDefaulter = &DeploymentPolicyWebhook{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *DeploymentPolicyWebhook) Default(ctx context.Context, obj runtime.Object) error {

operator/config/crd/kustomization.yaml

@@ -19,6 +19,7 @@
 # It should be run by config/default
 resources:
 - bases/skyhook.nvidia.com_skyhooks.yaml
+- bases/skyhook.nvidia.com_deploymentpolicies.yaml
 
 patches:
 - path: patches/webhook_in_skyhooks.yaml

operator/internal/controller/webhook_controller.go

@@ -309,6 +309,14 @@ func webhookMutatingWebhookConfiguration(namespace, serviceName string, secret *
 				SideEffects:             ptr(admissionregistrationv1.SideEffectClassNone),
 				AdmissionReviewVersions: []string{"v1"},
 			},
+			{
+				Name:                    "mutate-deploymentpolicy.nvidia.com",
+				ClientConfig:            webhookClient(serviceName, namespace, "/mutate-skyhook-nvidia-com-v1alpha1-deploymentpolicy", secret),
+				FailurePolicy:           ptr(admissionregistrationv1.Fail),
+				Rules:                   webhookRule(),
+				SideEffects:             ptr(admissionregistrationv1.SideEffectClassNone),
+				AdmissionReviewVersions: []string{"v1"},
+			},
 		},
 	}
 
@@ -360,6 +368,14 @@ func webhookRule() []admissionregistrationv1.RuleWithOperations {
 				Resources:   []string{"skyhooks"},
 			},
 		},
+		{
+			Operations: []admissionregistrationv1.OperationType{admissionregistrationv1.Create, admissionregistrationv1.Update},
+			Rule: admissionregistrationv1.Rule{
+				APIGroups:   []string{v1alpha1.GroupVersion.Group},
+				APIVersions: []string{v1alpha1.GroupVersion.Version},
+				Resources:   []string{"deploymentpolicies"},
+			},
+		},
 	}
 }