chore(ci): Helm CRDs refactoring

squakez · Aug 7, 2024 · 1da5ce6 · 1da5ce6
1 parent 5893e60
commit 1da5ce6
Show file tree

Hide file tree

Showing 12 changed files with 38,398 additions and 38,516 deletions.
diff --git a/e2e/install/helm/setup_test.go b/e2e/install/helm/setup_test.go
@@ -38,13 +38,12 @@ import (
 )
 
 func TestHelmInstallation(t *testing.T) {
-	containerRegistry, ok := os.LookupEnv("KAMEL_INSTALL_REGISTRY")
-	g.Expect(ok).To(BeTrue())
-
 	WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
+		containerRegistry, ok := os.LookupEnv("KAMEL_INSTALL_REGISTRY")
+		g.Expect(ok).To(BeTrue())
 		// Let's make sure no CRD is yet available in the cluster
-		// as we must make the Helm procedure to install them accordingly
-		g.Eventually(CRDs(t)).Should(BeNil())
+		// as we must make the procedure to install them accordingly
+		g.Eventually(CRDs(t)).Should(BeNil(), "No Camel K CRDs should be previously installed for this test")
 		operatorID := "helm-ck"
 		os.Setenv("CAMEL_K_TEST_MAKE_DIR", "../../../")
 		ExpectExecSucceed(t, g,
@@ -66,14 +65,14 @@ func TestHelmInstallation(t *testing.T) {
 		)
 
 		g.Eventually(OperatorPod(t, ctx, ns)).ShouldNot(BeNil())
-		// Check if restricted security context has been applyed
+		// Check if restricted security context has been applied
 		operatorPod := OperatorPod(t, ctx, ns)()
 		g.Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
 		g.Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
 		g.Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
 		g.Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
 
-		//Test a simple route
+		// Test a simple route
 		t.Run("simple route", func(t *testing.T) {
 			name := RandomizedSuffixName("yaml")
 			g.Expect(KamelRunWithID(t, ctx, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())

diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml
diff --git a/helm/camel-k/crds/crd-build.yaml b/helm/camel-k/crds/crd-build.yaml
diff --git a/helm/camel-k/crds/crd-camel-catalog.yaml b/helm/camel-k/crds/crd-camel-catalog.yaml
diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml
diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml
diff --git a/helm/camel-k/crds/crd-integration-profile.yaml b/helm/camel-k/crds/crd-integration-profile.yaml
diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml
diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml
diff --git a/script/gen_crd.sh b/script/gen_crd.sh
@@ -32,6 +32,10 @@ rm -rf ./config
 # to root
 cd ../../../
 
+# Importing helm CRDs
+cat ./script/headers/yaml.txt > ./helm/camel-k/crds/camel-k-crds.yaml
+kustomize build ./pkg/resources/config/crd/. >> ./helm/camel-k/crds/camel-k-crds.yaml
+
 deploy_crd_file() {
   source=$1
 
@@ -55,8 +59,7 @@ deploy_crd() {
   name=$1
   plural=$2
 
-  deploy_crd_file ./pkg/resources/config/crd/bases/camel.apache.org_"$plural".yaml \
-    ./helm/camel-k/crds/crd-"$name".yaml
+  deploy_crd_file ./pkg/resources/config/crd/bases/camel.apache.org_"$plural".yaml
 }
 
 deploy_crd build builds