Merge pull request #1700 from Kuadrant/add-apiproduct-apikey-to-kuadrant

Add apiproduct apikey to kuadrant

Author: Patryk-Stefanski

Makefile

@@ -182,6 +182,21 @@ else
 RELATED_IMAGE_WASMSHIM ?= oci://quay.io/kuadrant/wasm-shim:$(WASM_SHIM_VERSION)
 endif
 
+## developer-portal-controller
+DEVELOPERPORTAL_VERSION ?= latest
+developerportal_version_is_semantic := $(call is_semantic_version,$(DEVELOPERPORTAL_VERSION))
+
+ifeq (latest,$(DEVELOPERPORTAL_VERSION))
+RELATED_IMAGE_DEVELOPERPORTAL ?= quay.io/kuadrant/developer-portal-controller:latest
+DEVELOPERPORTAL_GITREF = main
+else ifeq (true,$(developerportal_version_is_semantic))
+RELATED_IMAGE_DEVELOPERPORTAL ?= quay.io/kuadrant/developer-portal-controller:v$(DEVELOPERPORTAL_VERSION)
+DEVELOPERPORTAL_GITREF = v$(DEVELOPERPORTAL_VERSION)
+else
+RELATED_IMAGE_DEVELOPERPORTAL ?= quay.io/kuadrant/developer-portal-controller:$(DEVELOPERPORTAL_VERSION)
+DEVELOPERPORTAL_GITREF = $(DEVELOPERPORTAL_VERSION)
+endif
+
 ## gatewayapi-provider
 GATEWAYAPI_PROVIDER ?= istio
 
@@ -332,10 +347,12 @@ extensions-manifests: controller-gen ## Generate WebhookConfiguration, ClusterRo
 dependencies-manifests: export AUTHORINO_OPERATOR_GITREF := $(AUTHORINO_OPERATOR_GITREF)
 dependencies-manifests: export LIMITADOR_OPERATOR_GITREF := $(LIMITADOR_OPERATOR_GITREF)
 dependencies-manifests: export DNS_OPERATOR_GITREF := $(DNS_OPERATOR_GITREF)
+dependencies-manifests: export DEVELOPERPORTAL_GITREF := $(DEVELOPERPORTAL_GITREF)
 dependencies-manifests: ## Update kuadrant dependencies manifests.
 	$(call patch-config,config/dependencies/authorino/kustomization.template.yaml,config/dependencies/authorino/kustomization.yaml)
 	$(call patch-config,config/dependencies/limitador/kustomization.template.yaml,config/dependencies/limitador/kustomization.yaml)
 	$(call patch-config,config/dependencies/dns/kustomization.template.yaml,config/dependencies/dns/kustomization.yaml)
+	$(call patch-config,config/dependencies/developer-portal/kustomization.template.yaml,config/dependencies/developer-portal/kustomization.yaml)
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -430,14 +447,17 @@ bundle: $(OPM) $(YQ) manifests dependencies-manifests kustomize operator-sdk ##
 	# Set desired Wasm-shim image
 	V="$(RELATED_IMAGE_WASMSHIM)" \
 	$(YQ) eval '(select(.kind == "Deployment").spec.template.spec.containers[].env[] | select(.name == "RELATED_IMAGE_WASMSHIM").value) = strenv(V)' -i config/manager/manager.yaml
+	# Set desired developer-portal-controller image
+	V="$(RELATED_IMAGE_DEVELOPERPORTAL)" \
+	$(YQ) eval '(select(.kind == "Deployment").spec.template.spec.containers[].env[] | select(.name == "RELATED_IMAGE_DEVELOPERPORTAL").value) = strenv(V)' -i config/manager/manager.yaml
 	# Set desired operator image
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	# Update CSV
 	$(call update-csv-config,kuadrant-operator.v$(BUNDLE_VERSION),config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml,.metadata.name)
 	$(call update-csv-config,$(BUNDLE_VERSION),config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml,.spec.version)
 	$(call update-csv-config,$(IMG),config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml,.metadata.annotations.containerImage)
 	# Generate bundle
-	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
+	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS) --extra-service-accounts=developer-portal-controller-manager
 	$(MAKE) bundle-post-generate LIMITADOR_OPERATOR_BUNDLE_IMG=$(LIMITADOR_OPERATOR_BUNDLE_IMG) \
 		AUTHORINO_OPERATOR_BUNDLE_IMG=$(AUTHORINO_OPERATOR_BUNDLE_IMG) \
 		DNS_OPERATOR_BUNDLE_IMG=$(DNS_OPERATOR_BUNDLE_IMG)

api/v1beta1/kuadrant_types.go

@@ -71,6 +71,13 @@ func (k *Kuadrant) IsMTLSAuthorinoEnabled() bool {
 	return k.Spec.MTLS.IsAuthorinoEnabled()
 }
 
+func (k *Kuadrant) IsDeveloperPortalEnabled() bool {
+	if k == nil || k.Spec.Components == nil || k.Spec.Components.DeveloperPortal == nil {
+		return false
+	}
+	return k.Spec.Components.DeveloperPortal.Enabled
+}
+
 // KuadrantSpec defines the desired state of Kuadrant
 type KuadrantSpec struct {
 	Observability Observability `json:"observability,omitempty"`
@@ -79,6 +86,9 @@ type KuadrantSpec struct {
 	// will add the configuration required to enable mTLS between an Istio provided
 	// gateway and the Kuadrant components.
 	MTLS *MTLS `json:"mtls,omitempty"`
+	// +optional
+	// Components configures optional Kuadrant components
+	Components *Components `json:"components,omitempty"`
 }
 
 // Observability configures telemetry and monitoring settings for Kuadrant components.
@@ -142,6 +152,16 @@ type LogLevel struct {
 	Error *string `json:"error,omitempty"`
 }
 
+type Components struct {
+	// +optional
+	// DeveloperPortal enables the developer portal integration including APIProduct and APIKeyRequest CRDs
+	DeveloperPortal *DeveloperPortal `json:"developerPortal,omitempty"`
+}
+
+type DeveloperPortal struct {
+	Enabled bool `json:"enabled,omitempty"`
+}
+
 type MTLS struct {
 	Enable bool `json:"enable,omitempty"`
 

api/v1beta1/kuadrant_types_test.go

@@ -308,3 +308,53 @@ func TestLogLevelStructure(t *testing.T) {
 		})
 	}
 }
+
+func TestIsDeveloperPortalEnabled(t *testing.T) {
+	tests := []struct {
+		name        string
+		components  *Components
+		expectedRes bool
+	}{
+		{
+			name:        "components is nil",
+			components:  nil,
+			expectedRes: false,
+		},
+		{
+			name:        "developer portal not set",
+			components:  &Components{},
+			expectedRes: false,
+		},
+		{
+			name: "developer portal disabled",
+			components: &Components{
+				DeveloperPortal: &DeveloperPortal{Enabled: false},
+			},
+			expectedRes: false,
+		},
+		{
+			name: "developer portal enabled",
+			components: &Components{
+				DeveloperPortal: &DeveloperPortal{Enabled: true},
+			},
+			expectedRes: true,
+		},
+	}
+	for _, tt := range tests {
+		kuadrantCR := &Kuadrant{
+			Spec: KuadrantSpec{
+				Components: tt.components,
+			},
+		}
+		t.Run(tt.name, func(subT *testing.T) {
+			got := kuadrantCR.IsDeveloperPortalEnabled()
+			assert.Equal(subT, got, tt.expectedRes)
+		})
+	}
+
+	t.Run("kuadrant is nil", func(subT *testing.T) {
+		var kuadrantCR *Kuadrant
+		got := kuadrantCR.IsDeveloperPortalEnabled()
+		assert.Assert(subT, !got)
+	})
+}