Merge pull request #22 from redpanda-data/sj/feat/add-org-id-to-operator

redpanda-data · Nov 22, 2023 · b394182 · b394182
2 parents d03a1bb + 53cae91
commit b394182
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/src/go/k8s/api/cluster.redpanda.com/v1alpha1/zz_generated.deepcopy.go b/src/go/k8s/api/cluster.redpanda.com/v1alpha1/zz_generated.deepcopy.go
diff --git a/src/go/k8s/api/vectorized/v1alpha1/console_enterprise_types.go b/src/go/k8s/api/vectorized/v1alpha1/console_enterprise_types.go
@@ -45,6 +45,11 @@ type EnterpriseLoginRedpandaCloud struct {
 
 	// AllowedOrigins indicates if response is allowed from given origin
 	AllowedOrigins []string `json:"allowedOrigins,omitempty" yaml:"allowedOrigins,omitempty"`
+
+	// OrgID refers to the Redpanda Cloud organization id that Console is running in.
+	// If the OrgID is set, Console will ensure that incoming requests will only pass
+	// if the provided access token matches this org id in the custom claims.
+	OrgID string `json:"orgId,omitempty" yaml:"orgId,omitempty"`
 }
 
 // IsGoogleLoginEnabled returns true if Google SSO provider is enabled

diff --git a/src/go/k8s/config/crd/bases/redpanda.vectorized.io_consoles.yaml b/src/go/k8s/config/crd/bases/redpanda.vectorized.io_consoles.yaml
@@ -479,6 +479,13 @@ spec:
                         type: string
                       enabled:
                         type: boolean
+                      orgId:
+                        description: OrgID refers to the Redpanda Cloud organization
+                          id that Console is running in. If the OrgID is set, Console
+                          will ensure that incoming requests will only pass if the
+                          provided access token matches this org id in the custom
+                          claims.
+                        type: string
                     required:
                     - audience
                     - domain

diff --git a/src/go/k8s/pkg/console/configmap.go b/src/go/k8s/pkg/console/configmap.go
@@ -304,6 +304,7 @@ func (cm *ConfigMap) genLogin(
 		switch {
 		case provider.RedpandaCloud != nil:
 			enterpriseLogin.RedpandaCloud = &vectorizedv1alpha1.EnterpriseLoginRedpandaCloud{
+				OrgID:          provider.RedpandaCloud.OrgID,
 				Enabled:        provider.RedpandaCloud.Enabled,
 				Domain:         provider.RedpandaCloud.Domain,
 				Audience:       provider.RedpandaCloud.Audience,