Defaulting to the latest tag if no tag was specified.

api/v1beta1/module_types.go

@@ -46,6 +46,7 @@ type KanikoParams struct {
 
 type Build struct {
 	// +optional
+	// +nullable
 	// BuildArgs is an array of build variables that are provided to the image building backend.
 	BuildArgs []BuildArg `json:"buildArgs"`
 
@@ -125,6 +126,7 @@ type KernelMapping struct {
 	InTreeModuleToRemove string `json:"inTreeModuleToRemove"`
 
 	// +optional
+	// +nullable
 	// InTreeModulesToRemove specifies any number of  in-tree kernel modules that should be removed (if present)
 	// before loading the kernel module from the ContainerImage
 	InTreeModulesToRemove []string `json:"inTreeModulesToRemove"`
@@ -315,6 +317,7 @@ type ModuleSpec struct {
 	// DevicePlugin allows overriding some properties of the container that deploys the device plugin on the node.
 	// Name is ignored and is set automatically by the KMM Operator.
 	// +optional
+	// +nullable
 	DevicePlugin *DevicePluginSpec `json:"devicePlugin"`
 
 	// ModuleLoader allows overriding some properties of the container that loads the kernel module on the node.

cmd/webhook-server/main.go

@@ -82,6 +82,10 @@ func main() {
 		if err = webhook.NewModuleValidator(logger).SetupWebhookWithManager(mgr); err != nil {
 			cmd.FatalError(setupLogger, err, "unable to create webhook", "webhook", "ModuleValidator")
 		}
+
+		if err = webhook.NewModuleDefaulter(logger).SetupWebhookWithManager(mgr); err != nil {
+			cmd.FatalError(setupLogger, err, "unable to create mutating webhook", "webhook", "ModuleDefaulter")
+		}
 	}
 
 	if enableManagedClusterModule {
@@ -90,6 +94,10 @@ func main() {
 		if err = hub.NewManagedClusterModuleValidator(logger).SetupWebhookWithManager(mgr); err != nil {
 			cmd.FatalError(setupLogger, err, "unable to create webhook", "webhook", "ManagedClusterModuleValidator")
 		}
+
+		if err = hub.NewManagedClusterModuleDefaulter(logger).SetupWebhookWithManager(mgr); err != nil {
+			cmd.FatalError(setupLogger, err, "unable to create mutating webhook", "webhook", "ManagedClusterModuleDefaulter")
+		}
 	}
 
 	if enableNamespaceDeletion {

config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml

@@ -48,6 +48,7 @@ spec:
                     description: |-
                       DevicePlugin allows overriding some properties of the container that deploys the device plugin on the node.
                       Name is ignored and is set automatically by the KMM Operator.
+                    nullable: true
                     properties:
                       container:
                         properties:
@@ -2188,6 +2189,7 @@ spec:
                                   - name
                                   - value
                                   type: object
+                                nullable: true
                                 type: array
                               dockerfileConfigMap:
                                 description: ConfigMap that holds Dockerfile contents
@@ -2318,6 +2320,7 @@ spec:
                                         - name
                                         - value
                                         type: object
+                                      nullable: true
                                       type: array
                                     dockerfileConfigMap:
                                       description: ConfigMap that holds Dockerfile
@@ -2394,6 +2397,7 @@ spec:
                                     before loading the kernel module from the ContainerImage
                                   items:
                                     type: string
+                                  nullable: true
                                   type: array
                                 literal:
                                   description: Literal defines a literal target kernel

config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml

@@ -44,6 +44,7 @@ spec:
                 description: |-
                   DevicePlugin allows overriding some properties of the container that deploys the device plugin on the node.
                   Name is ignored and is set automatically by the KMM Operator.
+                nullable: true
                 properties:
                   container:
                     properties:
@@ -2171,6 +2172,7 @@ spec:
                               - name
                               - value
                               type: object
+                            nullable: true
                             type: array
                           dockerfileConfigMap:
                             description: ConfigMap that holds Dockerfile contents
@@ -2299,6 +2301,7 @@ spec:
                                     - name
                                     - value
                                     type: object
+                                  nullable: true
                                   type: array
                                 dockerfileConfigMap:
                                   description: ConfigMap that holds Dockerfile contents
@@ -2374,6 +2377,7 @@ spec:
                                 before loading the kernel module from the ContainerImage
                               items:
                                 type: string
+                              nullable: true
                               type: array
                             literal:
                               description: Literal defines a literal target kernel

config/default-hub/kustomization.yaml

@@ -38,6 +38,13 @@ replacements:
         options:
           create: true
           delimiter: /
+      - select:
+          kind: MutatingWebhookConfiguration
+        fieldPaths:
+          - metadata.annotations.[cert-manager.io/inject-ca-from]
+        options:
+          create: true
+          delimiter: /
   - source:
       kind: Certificate
       fieldPath: metadata.name
@@ -58,6 +65,14 @@ replacements:
           create: true
           delimiter: /
           index: 1
+      - select:
+          kind: MutatingWebhookConfiguration
+        fieldPaths:
+          - metadata.annotations.[cert-manager.io/inject-ca-from]
+        options:
+          create: true
+          delimiter: /
+          index: 1
   # Replacements below adjust the DNS names of the webhook certificate based on the service name.
   - source:
       kind: Service

config/default/kustomization.yaml

@@ -39,6 +39,13 @@ replacements:
         options:
           create: true
           delimiter: /
+      - select:
+          kind: MutatingWebhookConfiguration
+        fieldPaths:
+          - metadata.annotations.[cert-manager.io/inject-ca-from]
+        options:
+          create: true
+          delimiter: /
   - source:
       kind: Certificate
       fieldPath: metadata.name
@@ -60,6 +67,14 @@ replacements:
           create: true
           delimiter: /
           index: 1
+      - select:
+          kind: MutatingWebhookConfiguration
+        fieldPaths:
+          - metadata.annotations.[cert-manager.io/inject-ca-from]
+        options:
+          create: true
+          delimiter: /
+          index: 1
   # Replacements below adjust the DNS names of the webhook certificate based on the service name.
   - source:
       kind: Service

config/webhook-hub/manifests.yaml

@@ -1,5 +1,31 @@
 ---
 apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: mutating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: webhook-service
+      namespace: system
+      path: /mutate-hub-kmm-sigs-x-k8s-io-v1beta1-managedclustermodule
+  failurePolicy: Fail
+  name: vmanageclustermodule.kb.io
+  rules:
+  - apiGroups:
+    - hub.kmm.sigs.x-k8s.io
+    apiVersions:
+    - v1beta1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - managedclustermodules
+  sideEffects: None
+---
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: validating-webhook-configuration

config/webhook/manifests.yaml

@@ -1,5 +1,31 @@
 ---
 apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: mutating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: webhook-service
+      namespace: system
+      path: /mutate-kmm-sigs-x-k8s-io-v1beta1-module
+  failurePolicy: Fail
+  name: vmodule.kb.io
+  rules:
+  - apiGroups:
+    - kmm.sigs.x-k8s.io
+    apiVersions:
+    - v1beta1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - modules
+  sideEffects: None
+---
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: validating-webhook-configuration

internal/registry/registry.go

@@ -113,10 +113,6 @@ func (r *registry) getPullOptions(ctx context.Context, image string, tlsOptions
 		repo = tag[0]
 	}
 
-	if repo == "" {
-		return nil, fmt.Errorf("image url %s is not valid, does not contain hash or tag", image)
-	}
-
 	options := []crane.Option{
 		crane.WithContext(ctx),
 	}

internal/registry/registry_test.go

@@ -57,14 +57,6 @@ var _ = Describe("ImageExists", func() {
 			Expect(err.Error()).To(ContainSubstring("failed to get pull options for image"))
 		})
 
-		It("should fail if the image name isn't valid", func() {
-
-			_, err = reg.ImageExists(ctx, invalidImage, &kmmv1beta1.TLSOptions{}, nil)
-
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("does not contain hash or tag"))
-		})
-
 		It("should fail if it cannot get key chain from secret", func() {
 
 			mockRegistryAuthGetter.EXPECT().GetKeyChain(ctx).Return(nil, errors.New("some error"))
@@ -222,14 +214,6 @@ var _ = Describe("GetLayersDigests", func() {
 			Expect(err.Error()).To(ContainSubstring("failed to get pull options for image"))
 		})
 
-		It("should fail if the image name isn't valid", func() {
-
-			_, err = reg.ImageExists(ctx, invalidImage, &kmmv1beta1.TLSOptions{}, nil)
-
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("does not contain hash or tag"))
-		})
-
 		It("should fail if it cannot get key chain from secret", func() {
 
 			mockRegistryAuthGetter.EXPECT().GetKeyChain(ctx).Return(nil, errors.New("some error"))
@@ -393,13 +377,6 @@ var _ = Describe("GetDigest", func() {
 			Expect(err.Error()).To(ContainSubstring("failed to get pull options for image"))
 		})
 
-		It("should fail if the image name isn't valid", func() {
-			_, err = reg.GetDigest(ctx, invalidImage, &kmmv1beta1.TLSOptions{}, nil)
-
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("does not contain hash or tag"))
-		})
-
 		It("should fail if it cannot get key chain from secret", func() {
 			mockRegistryAuthGetter.EXPECT().GetKeyChain(ctx).Return(nil, errors.New("some error"))
 

internal/webhook/hub/managedclustermodule_mutator.go

@@ -0,0 +1,68 @@
+/*
+Copyright 2022.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package hub
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/go-logr/logr"
+	"github.com/kubernetes-sigs/kernel-module-management/api-hub/v1beta1"
+	"github.com/kubernetes-sigs/kernel-module-management/internal/webhook"
+	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
+)
+
+// FIXME: remove the code that returned an error until now
+type ManagedClusterModuleDefaulter struct {
+	logger          logr.Logger
+	moduleDefaulter *webhook.ModuleDefaulter
+}
+
+func NewManagedClusterModuleDefaulter(logger logr.Logger) *ManagedClusterModuleDefaulter {
+	return &ManagedClusterModuleDefaulter{
+		logger:          logger,
+		moduleDefaulter: webhook.NewModuleDefaulter(logger),
+	}
+}
+
+func (mcmd *ManagedClusterModuleDefaulter) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	// controller-runtime will set the path to `mutate-<group>-<version>-<resource> so we
+	// need to make sure it is set correctly in the +kubebuilder annotation below.
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(&v1beta1.ManagedClusterModule{}).
+		WithDefaulter(mcmd).
+		Complete()
+}
+
+//+kubebuilder:webhook:path=/mutate-hub-kmm-sigs-x-k8s-io-v1beta1-managedclustermodule,mutating=true,failurePolicy=fail,sideEffects=None,groups=hub.kmm.sigs.x-k8s.io,resources=managedclustermodules,verbs=create;update,versions=v1beta1,name=vmanageclustermodule.kb.io,admissionReviewVersions=v1
+
+// Default implements webhook.Default so a webhook will be registered for the type
+func (mcmd *ManagedClusterModuleDefaulter) Default(ctx context.Context, obj runtime.Object) error {
+
+	mcm, ok := obj.(*v1beta1.ManagedClusterModule)
+	if !ok {
+		return fmt.Errorf("bad type for the object; expected %T, got %T", mcm, obj)
+	}
+
+	mcmd.logger.Info("Mutating ManagedClusterModule creation", "name", mcm.Name, "namespace", mcm.Namespace)
+
+	webhook.SetDefaultContainerImageTagIfNeeded(&mcm.Spec.ModuleSpec)
+	webhook.SetDefaultKernelMappingTagsIfNeeded(&mcm.Spec.ModuleSpec)
+
+	return nil
+}