fix: fixed helm chart generation to include crds directly in the temp…

…late (#801) Signed-off-by: realanna <anna.reale@dynatrace.com>
keptn · Feb 9, 2023 · f46e603 · f46e603
1 parent d19b533
commit f46e603
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 54 deletions.
diff --git a/Makefile b/Makefile
@@ -68,7 +68,7 @@ clean-helm-yaml:
 build-release-manifests:
 	$(MAKE) -C operator generate
 	$(MAKE) -C klt-cert-manager generate
-	$(MAKE) -C operator release-helm-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH)
+	$(MAKE) -C operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH)
 	$(MAKE) -C scheduler release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH)
 	$(MAKE) -C klt-cert-manager release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH)
 

diff --git a/helm/.gitignore b/helm/.gitignore
@@ -1,3 +1,4 @@
 *.tgz
 chart/templates/rendered.yaml
+chart/templates/crds.yaml
 chart/crds/*.yaml
diff --git a/helm/chart/crds/.gitkeep b/helm/chart/crds/.gitkeep
diff --git a/helm/overlay/kustomization.yaml b/helm/overlay/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 # import the default deployment as the base
 bases:
-  - ../../operator/config/default/base
+  - ../../operator/config/default
   - ../../klt-cert-manager/config/default
   - ../../scheduler/manifests/install
 # replace the default namespace with {{ include "chart.namespace" . }}

diff --git a/operator/Makefile b/operator/Makefile
@@ -69,11 +69,6 @@ help: ## Display this help.
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
-.PHONY: gen-crds
-gen-crds: manifests #create CustomResourceDefinition objects for helm.
-	kustomize build config/crd > ../helm/chart/crds/crds.yaml
-
-
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -141,12 +136,6 @@ release-manifests: manifests
 	echo "building default overlay"
 	kustomize build config/default > config/rendered/release.yaml
 
-.PHONY: release-helm-manifests
- release-helm-manifests: manifests gen-crds
-	echo "building helm overlay"
-	cd config/manager && kustomize edit set image controller=$(RELEASE_REGISTRY)/$(RELEASE_IMAGE)
-	kustomize build config/default/base > config/rendered/release.yaml
-
 .PHONY: deploy
 deploy: manifests ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && kustomize edit set image controller=${IMG}

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnapps.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptnapps.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnapps.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnappversions.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnevaluationdefinitions.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnevaluationproviders.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluations.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluations.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnevaluations.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptntaskdefinitions.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptntasks.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptntasks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptntasks.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnworkloadinstances.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml b/operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnworkloads.lifecycle.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml b/operator/config/crd/bases/metrics.keptn.sh_keptnmetrics.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnmetrics.metrics.keptn.sh
 spec:

diff --git a/operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml b/operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: keptnconfigs.options.keptn.sh
 spec:

diff --git a/operator/config/default/base/kustomization.yaml b/operator/config/default/base/kustomization.yaml
diff --git a/operator/config/default/kustomization.yaml b/operator/config/default/kustomization.yaml
@@ -1,6 +1,15 @@
 # Adds namespace to all resources.
 namespace: keptn-lifecycle-toolkit-system
 
+namePrefix: klc-
+
 bases:
 - ../crd
-- ./base
+- ../rbac
+- ../manager
+- ../webhook
+- ../metrics
+
+patchesStrategicMerge:
+- manager_auth_proxy_patch.yaml
+- webhooknamespaces_patch.yaml
diff --git a/...efault/base/manager_auth_proxy_patch.yaml → ...fig/default/manager_auth_proxy_patch.yaml b/...efault/base/manager_auth_proxy_patch.yaml → ...fig/default/manager_auth_proxy_patch.yaml
diff --git a/...ig/default/base/manager_config_patch.yaml → .../config/default/manager_config_patch.yaml b/...ig/default/base/manager_config_patch.yaml → .../config/default/manager_config_patch.yaml
diff --git a/...default/base/webhooknamespaces_patch.yaml → ...nfig/default/webhooknamespaces_patch.yaml b/...default/base/webhooknamespaces_patch.yaml → ...nfig/default/webhooknamespaces_patch.yaml