feat: allow extra env vars for addons

Makefile

@@ -265,16 +265,26 @@ cleanup: kind
 	$(KIND) delete cluster --name kamaji
 
 .PHONY: e2e
-e2e: env build load helm ginkgo cert-manager gateway-api envoy-gateway ## Create a KinD cluster, install Kamaji on it and run the test suite.
+e2e: env e2e-setup e2e-test
+
+.PHONY: e2e-setup
+e2e-setup: build load helm ginkgo cert-manager gateway-api envoy-gateway ## Create a KinD cluster, install Kamaji on it and run the test suite.
 	$(HELM) upgrade --debug --install kamaji-crds ./charts/kamaji-crds --create-namespace --namespace kamaji-system
 	$(HELM) repo add clastix https://clastix.github.io/charts
 	$(HELM) dependency build ./charts/kamaji
 	$(HELM) upgrade --debug --install kamaji ./charts/kamaji --create-namespace --namespace kamaji-system --set "image.tag=$(VERSION)" --set "image.pullPolicy=Never" --set "telemetry.disabled=true"
 	$(MAKE) datastores
-	$(GINKGO) -v ./e2e
 
 ##@ Document
 
+.PHONY: e2e-redeploy
+e2e-redeploy: build load
+	$(HELM) upgrade --debug --install kamaji ./charts/kamaji --create-namespace --namespace kamaji-system --set "image.tag=$(VERSION)" --set "image.pullPolicy=Never" --set "telemetry.disabled=true"
+
+.PHONY: e2e-test
+e2e-test: build load
+	$(GINKGO) -v ./e2e
+
 CAPI_URL = https://github.com/clastix/cluster-api-control-plane-provider-kamaji.git
 CAPI_DIR := $(shell mktemp -d)
 CRDS_DIR := $(shell mktemp -d)

api/v1alpha1/tenantcontrolplane_types.go

@@ -258,6 +258,7 @@ type ServiceSpec struct {
 // AddonSpec defines the spec for every addon.
 type AddonSpec struct {
 	ImageOverrideTrait `json:",inline"`
+	ExtraEnvs          []corev1.EnvVar `json:"extraEnvs,omitempty"`
 }
 
 type ImageOverrideTrait struct {
@@ -289,6 +290,7 @@ type KonnectivityServerSpec struct {
 	// Resources define the amount of CPU and memory to allocate to the Konnectivity server.
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
 	ExtraArgs ExtraArgs                    `json:"extraArgs,omitempty"`
+	ExtraEnvs []corev1.EnvVar              `json:"extraEnvs,omitempty"`
 }
 
 type KonnectivityAgentMode string
@@ -314,6 +316,7 @@ type KonnectivityAgentSpec struct {
 	//+kubebuilder:default={{key: "CriticalAddonsOnly", operator: "Exists"}}
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 	ExtraArgs   ExtraArgs           `json:"extraArgs,omitempty"`
+	ExtraEnvs   []corev1.EnvVar     `json:"extraEnvs,omitempty"`
 	// HostNetwork enables the konnectivity agent to use the Host network namespace.
 	// By enabling this mode, the Agent doesn't need to wait for the CNI initialisation,
 	// enabling a sort of out-of-band access to nodes for troubleshooting scenarios,