ARO-4373 add the BoundServiceAccountSigningKey to ClusterProfile

Azure · May 28, 2024 · e575cff · e575cff
1 parent 746c633
commit e575cff
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go
@@ -258,12 +258,13 @@ type OIDCIssuer string
 type ClusterProfile struct {
 	MissingFields
 
-	PullSecret           SecureString         `json:"pullSecret,omitempty"`
-	Domain               string               `json:"domain,omitempty"`
-	Version              string               `json:"version,omitempty"`
-	ResourceGroupID      string               `json:"resourceGroupId,omitempty"`
-	FipsValidatedModules FipsValidatedModules `json:"fipsValidatedModules,omitempty"`
-	OIDCIssuer           OIDCIssuer           `json:"oidcIssuer,omitempty"`
+	PullSecret                    SecureString         `json:"pullSecret,omitempty"`
+	Domain                        string               `json:"domain,omitempty"`
+	Version                       string               `json:"version,omitempty"`
+	ResourceGroupID               string               `json:"resourceGroupId,omitempty"`
+	FipsValidatedModules          FipsValidatedModules `json:"fipsValidatedModules,omitempty"`
+	OIDCIssuer                    OIDCIssuer           `json:"oidcIssuer,omitempty"`
+	BoundServiceAccountSigningKey SecureString         `json:"boundServiceAccountSigningKey,omitempty"`
 }
 
 // FeatureProfile represents a feature profile.

diff --git a/pkg/frontend/asyncoperationresult_get.go b/pkg/frontend/asyncoperationresult_get.go
@@ -67,6 +67,7 @@ func (f *frontend) _getAsyncOperationResult(ctx context.Context, r *http.Request
 	if asyncdoc.OpenShiftCluster.Properties.ServicePrincipalProfile != nil {
 		asyncdoc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientSecret = ""
 	}
+	asyncdoc.OpenShiftCluster.Properties.ClusterProfile.BoundServiceAccountSigningKey = ""
 
 	return json.MarshalIndent(converter.ToExternal(asyncdoc.OpenShiftCluster), "", "    ")
 }
diff --git a/pkg/frontend/openshiftcluster_get.go b/pkg/frontend/openshiftcluster_get.go
@@ -48,6 +48,7 @@ func (f *frontend) _getOpenShiftCluster(ctx context.Context, log *logrus.Entry,
 	if doc.OpenShiftCluster.Properties.ServicePrincipalProfile != nil {
 		doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientSecret = ""
 	}
+	doc.OpenShiftCluster.Properties.ClusterProfile.BoundServiceAccountSigningKey = ""
 
 	return json.MarshalIndent(converter.ToExternal(doc.OpenShiftCluster), "", "    ")
 }
diff --git a/pkg/frontend/openshiftcluster_list.go b/pkg/frontend/openshiftcluster_list.go
@@ -70,6 +70,7 @@ func (f *frontend) _getOpenShiftClusters(ctx context.Context, log *logrus.Entry,
 		if ocs[i].Properties.ServicePrincipalProfile != nil {
 			ocs[i].Properties.ServicePrincipalProfile.ClientSecret = ""
 		}
+		ocs[i].Properties.ClusterProfile.BoundServiceAccountSigningKey = ""
 	}
 
 	nextLink, err := f.buildNextLink(r.Header.Get("Referer"), i.Continuation())

diff --git a/pkg/frontend/openshiftcluster_putorpatch.go b/pkg/frontend/openshiftcluster_putorpatch.go
@@ -247,6 +247,7 @@ func (f *frontend) _putOrPatchOpenShiftCluster(ctx context.Context, log *logrus.
 	if doc.OpenShiftCluster.Properties.ServicePrincipalProfile != nil {
 		doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientSecret = ""
 	}
+	doc.OpenShiftCluster.Properties.ClusterProfile.BoundServiceAccountSigningKey = ""
 
 	// We don't return enriched worker profile data on PUT/PATCH operations
 	doc.OpenShiftCluster.Properties.WorkerProfilesStatus = nil

diff --git a/pkg/frontend/openshiftclustercredentials_post.go b/pkg/frontend/openshiftclustercredentials_post.go
@@ -70,6 +70,7 @@ func (f *frontend) _postOpenShiftClusterCredentials(ctx context.Context, r *http
 	if doc.OpenShiftCluster.Properties.ServicePrincipalProfile != nil {
 		doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientSecret = ""
 	}
+	doc.OpenShiftCluster.Properties.ClusterProfile.BoundServiceAccountSigningKey = ""
 
 	return json.MarshalIndent(converter.ToExternal(doc.OpenShiftCluster), "", "    ")
 }
diff --git a/pkg/frontend/openshiftclusterkubeconfigcredentials_post.go b/pkg/frontend/openshiftclusterkubeconfigcredentials_post.go
@@ -73,6 +73,7 @@ func (f *frontend) _postOpenShiftClusterKubeConfigCredentials(ctx context.Contex
 	if doc.OpenShiftCluster.Properties.ServicePrincipalProfile != nil {
 		doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientSecret = ""
 	}
+	doc.OpenShiftCluster.Properties.ClusterProfile.BoundServiceAccountSigningKey = ""
 
 	return json.MarshalIndent(converter.ToExternal(doc.OpenShiftCluster), "", "    ")
 }