feat(crdvalidator): nesting crdvalidator components to better integra…

…te with core Rukpak

Signed-off-by: Tyler Slaton <tyslaton@redhat.com>

Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /
 COPY plain plain
 COPY unpack unpack
 COPY core core
+COPY crdvalidator crdvalidator
 
 EXPOSE 8080
 ENTRYPOINT ["/plain"]

Makefile

@@ -102,6 +102,9 @@ install-apis: cert-mgr generate kustomize ## Install the core rukpak CRDs
 install-plain: install-apis ## Install the rukpak CRDs and the plain provisioner
 	$(KUSTOMIZE) build manifests/provisioners/plain | kubectl apply -f -
 
+install-crdvalidator: cert-mgr kustomize ## Install the crdvalidator webhook manifests to the current cluster.
+	$(KUSTOMIZE) build manifests/crdvalidator | kubectl apply -f -
+
 install: install-plain ## Install all rukpak core CRDs and provisioners
 
 deploy: install-apis install-crdvalidator ## Deploy the operator to the current cluster
@@ -122,7 +125,7 @@ cert-mgr: ## Install the certification manager
 
 # Binary builds
 VERSION_FLAGS=-ldflags "-X $(VERSION_PATH).GitCommit=$(GIT_COMMIT)"
-build: plain unpack core
+build: plain unpack core crdvalidator
 
 plain:
 	CGO_ENABLED=0 go build $(VERSION_FLAGS) -o $(BIN_DIR)/$@ ./internal/provisioner/plain
@@ -133,6 +136,9 @@ unpack:
 core:
 	CGO_ENABLED=0 go build $(VERSION_FLAGS) -o $(BIN_DIR)/$@ ./cmd/core/...
 
+crdvalidator: 
+	CGO_ENABLED=0 go build $(VERSION_FLAGS) -o $(BIN_DIR)/$@ ./cmd/crdvalidator
+
 build-container: export GOOS=linux
 build-container: BIN_DIR:=$(BIN_DIR)/$(GOOS)
 build-container: build ## Builds provisioner container image locally
@@ -159,35 +165,6 @@ kind-load-bundles: ## Load the e2e testdata container images into a kind cluster
 kind-load: ## Loads the currently constructed image onto the cluster
 	${KIND} load docker-image $(IMAGE) --name $(KIND_CLUSTER_NAME)
 
-##################################
-# CRDValidator Webhook Targets #
-##################################
-.PHONY: crdvalidator build-crdvalidator-image kind-load-crdvalidator install-crdvalidator deploy-crdvalidator
-
-##@ crdvalidator:
-
-crdvalidator: 
-	CGO_ENABLED=0 go build $(VERSION_FLAGS) -o $(BIN_DIR)/$@ ./cmd/crdvalidator
-
-CRD_WEBHOOK_IMAGE_REPO=quay.io/operator-framework/crd-validation-webhook
-CRD_WEBHOOK_IMAGE=$(CRD_WEBHOOK_IMAGE_REPO):main
-build-crdvalidator-image: ## Builds crd-validation-webhook container image locally
-	docker build -f Dockerfile.crdvalidator -t $(CRD_WEBHOOK_IMAGE) .
-
-kind-load-crdvalidator: ## Loads the currently constructed crd-validation-webhook onto the cluster
-	${KIND} load docker-image $(CRD_WEBHOOK_IMAGE) --name $(KIND_CLUSTER_NAME)
-
-install-crdvalidator: build-crdvalidator-image kind-load-crdvalidator ## Install the crdvalidator manifests to the current cluster. Requires that cert-manager is installed prior.
-	kubectl apply -f cmd/crdvalidator/manifests
-
-deploy-crdvalidator: cert-mgr install-crdvalidator ## Install the crdvalidator manifests to the current cluster and ensures that cert-manager is installed prior.
-
-test-crdvalidator-e2e: ginkgo ## Run the crdvalidator e2e tests. Assumes you have already installed the crdvalidator webhook.
-	$(GINKGO) -trace -progress $(FOCUS) cmd/crdvalidator/test/e2e
-
-crdvalidator-e2e: KIND_CLUSTER_NAME=crdvalidator-e2e
-crdvalidator-e2e: kind-cluster deploy-crdvalidator test-crdvalidator-e2e ## Run the crdvalidator e2e tests. Assumes you have already installed the crdvalidator webhook.
-
 ################
 # Hack / Tools #
 ################

cmd/crdvalidator/internal/handlers/crd.go → cmd/crdvalidator/handlers/crd.go

@@ -22,7 +22,7 @@ import (
 	"net/http"
 
 	"github.com/go-logr/logr"
-	"github.com/operator-framework/rukpak/cmd/crdvalidator/internal/crd"
+	"github.com/operator-framework/rukpak/internal/crd"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

cmd/crdvalidator/main.go

@@ -19,7 +19,7 @@ package main
 import (
 	"os"
 
-	"github.com/operator-framework/rukpak/cmd/crdvalidator/internal/handlers"
+	"github.com/operator-framework/rukpak/cmd/crdvalidator/handlers"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"

cmd/crdvalidator/manifests/05_deployment.yaml → manifests/crdvalidator/05_deployment.yaml

@@ -14,7 +14,9 @@ spec:
     spec:
       serviceAccountName: crd-validation-webhook
       containers:
-        - image: quay.io/operator-framework/crd-validation-webhook:main
+        - image: quay.io/operator-framework/plain-provisioner:latest
+          imagePullPolicy: IfNotPresent
+          command: ["/crdvalidator"]
           name: crd-validation-webhook
           volumeMounts:
             - name: tls

manifests/crdvalidator/kustomization.yml

@@ -0,0 +1,8 @@
+resources:
+  - 00_namespace.yaml
+  - 01_cluster_role.yaml
+  - 01_service_account.yaml
+  - 02_cluster_role_binding.yaml
+  - 03_service.yaml
+  - 04_webhook.yaml
+  - 05_deployment.yaml

cmd/crdvalidator/test/e2e/crdvalidator_test.go → test/e2e/crdvalidator_test.go

@@ -46,11 +46,8 @@ var _ = Describe("crd validation webhook", func() {
 					},
 				)
 
-				err := c.Create(ctx, crd)
-				Expect(err).To(BeNil())
-
 				Eventually(func() error {
-					return c.Get(ctx, client.ObjectKeyFromObject(crd), crd)
+					return c.Create(ctx, crd)
 				}).Should(Succeed(), "should be able to create a safe crd but was not")
 			})
 
@@ -126,11 +123,8 @@ var _ = Describe("crd validation webhook", func() {
 					},
 				)
 
-				err := c.Create(ctx, crd)
-				Expect(err).To(BeNil())
-
 				Eventually(func() error {
-					return c.Get(ctx, client.ObjectKeyFromObject(crd), crd)
+					return c.Create(ctx, crd)
 				}).Should(Succeed(), "should be able to create a safe crd but was not")
 			})