Merge branch 'main' into ibakshay/remove-deprecated-plugin-status-con…

…dition
cloudoperators · Jan 29, 2025 · 1f19320 · 1f19320
2 parents 7d73e4d + 6f7eaf0
commit 1f19320
Show file tree

Hide file tree

Showing 29 changed files with 887 additions and 574 deletions.
diff --git a/Makefile b/Makefile
@@ -236,15 +236,36 @@ EXECUTION_ENV ?= LOCAL
 ADMIN_NAMESPACE ?= greenhouse
 ADMIN_RELEASE ?= greenhouse
 ADMIN_CHART_PATH ?= charts/manager
-WEBHOOK_DEV ?= false
 E2E_REPORT_PATH="$(shell pwd)/bin/$(SCENARIO)-e2e-report.json"
 PLUGIN_DIR ?=
 GREENHOUSE_ORG ?= demo
+WEBHOOK_ONLY ?= false
+DEV_MODE ?= false
+INTERNAL ?= -int
+
+.PHONY: setup
+setup: cli setup-manager setup-dashboard setup-demo
+
+.PHONY: setup-webhook-dev
+setup-webhook-dev:
+	DEV_MODE=true make setup-manager
+
+.PHONY: setup-controller-dev
+setup-controller-dev:
+	WEBHOOK_ONLY=true make setup-manager && INTERNAL= make setup-demo
+
+.PHONY: setup-manager
+setup-manager: cli
+	PLUGIN_PATH=$(PLUGIN_DIR) $(CLI) dev setup -f dev-env/localenv/dev.config.yaml d=$(DEV_MODE) e=WEBHOOK_ONLY=$(WEBHOOK_ONLY)
+
+.PHONY: setup-dashboard
+setup-dashboard: cli
+	$(CLI) dev setup dashboard -f dev-env/localenv/ui.config.yaml
 
 .PHONY: setup-demo
 setup-demo: prepare-e2e samples
 	kubectl create secret generic kind-$(REMOTE_CLUSTER) \
-		--from-literal=kubeconfig="$$(cat ${PWD}/bin/$(REMOTE_CLUSTER)-int.kubeconfig)" \
+		--from-literal=kubeconfig="$$(cat ${PWD}/bin/$(REMOTE_CLUSTER)$(INTERNAL).kubeconfig)" \
 		--namespace=$(GREENHOUSE_ORG) \
 		--type="greenhouse.sap/kubeconfig" \
 		--dry-run=client -o yaml | kubectl apply -f -
@@ -261,28 +282,15 @@ samples: kustomize
 		sleep 5; \
 	done
 
-.PHONY: setup-plugin-dev
-setup-plugin-dev: cli
-	PLUGIN_PATH=$(PLUGIN_DIR) $(CLI) dev setup -f dev-env/localenv/plugin.config.yaml && make setup-demo
-
-.PHONY: setup-dev
-setup-dev: cli
-	$(CLI) dev setup -f dev-env/localenv/dev.config.yaml
-
-.PHONY: setup-webhook
-setup-webhook: cli
-	$(CLI) dev setup webhook --name $(ADMIN_CLUSTER) --namespace $(ADMIN_NAMESPACE) --release $(ADMIN_RELEASE) --chart-path $(ADMIN_CHART_PATH) --dockerfile ./ --dev-mode=$(WEBHOOK_DEV)
-
 .PHONY: setup-e2e
 setup-e2e: cli
 	$(CLI) dev setup -f e2e/config.yaml
 	make prepare-e2e
 
 .PHONY: clean-e2e
 clean-e2e:
-	$(CLI) dev cluster delete --name $(REMOTE_CLUSTER)
-	$(CLI) dev cluster delete --name $(ADMIN_CLUSTER)
-	rm -v $(CLI)
+	kind delete cluster --name $(REMOTE_CLUSTER)
+	kind delete cluster --name $(ADMIN_CLUSTER)
 	rm -v $(LOCALBIN)/*.kubeconfig
 
 .PHONY: e2e

diff --git a/charts/manager/crds/greenhouse.sap_clusterkubeconfigs.yaml b/charts/manager/crds/greenhouse.sap_clusterkubeconfigs.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: clusterkubeconfigs.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_clusters.yaml b/charts/manager/crds/greenhouse.sap_clusters.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: clusters.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_organizations.yaml b/charts/manager/crds/greenhouse.sap_organizations.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: organizations.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_plugindefinitions.yaml b/charts/manager/crds/greenhouse.sap_plugindefinitions.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: plugindefinitions.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_pluginpresets.yaml b/charts/manager/crds/greenhouse.sap_pluginpresets.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: pluginpresets.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_plugins.yaml b/charts/manager/crds/greenhouse.sap_plugins.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: plugins.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_teammemberships.yaml b/charts/manager/crds/greenhouse.sap_teammemberships.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: teammemberships.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_teamrolebindings.yaml b/charts/manager/crds/greenhouse.sap_teamrolebindings.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: teamrolebindings.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_teamroles.yaml b/charts/manager/crds/greenhouse.sap_teamroles.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: teamroles.greenhouse.sap
 spec:
   group: greenhouse.sap

diff --git a/charts/manager/crds/greenhouse.sap_teams.yaml b/charts/manager/crds/greenhouse.sap_teams.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: teams.greenhouse.sap
 spec:
   group: greenhouse.sap