Skip to content

Commit

Permalink
deployment: merge auth cert configmap annotations into one
Browse files Browse the repository at this point in the history
  • Loading branch information
@liouk
liouk committed Jan 23, 2024
1 parent d390563 commit 093df36
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 73 deletions.
38 changes: 18 additions & 20 deletions pkg/console/subresource/deployment/deployment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,16 @@ const (
)

const (
configMapResourceVersionAnnotation = "console.openshift.io/console-config-version"
proxyConfigResourceVersionAnnotation = "console.openshift.io/proxy-config-version"
infrastructureConfigResourceVersionAnnotation = "console.openshift.io/infrastructure-config-version"
serviceCAConfigMapResourceVersionAnnotation = "console.openshift.io/service-ca-config-version"
oauthServingCertConfigMapResourceVersionAnnotation = "console.openshift.io/oauth-serving-cert-config-version"
trustedCAConfigMapResourceVersionAnnotation = "console.openshift.io/trusted-ca-config-version"
secretResourceVersionAnnotation = "console.openshift.io/oauth-secret-version"
consoleImageAnnotation = "console.openshift.io/image"
authnConfigVersionAnnotation = "console.openshift.io/authentication-config-version"
authnCATrustConfigMapResourceVersionAnnotation = "console.openshift.io/authn-ca-trust-config-version"
sessionSecretRVAnnotation = "console.openshift.io/session-secret-version"
configMapResourceVersionAnnotation = "console.openshift.io/console-config-version"
proxyConfigResourceVersionAnnotation = "console.openshift.io/proxy-config-version"
infrastructureConfigResourceVersionAnnotation = "console.openshift.io/infrastructure-config-version"
serviceCAConfigMapResourceVersionAnnotation = "console.openshift.io/service-ca-config-version"
trustedCAConfigMapResourceVersionAnnotation = "console.openshift.io/trusted-ca-config-version"
secretResourceVersionAnnotation = "console.openshift.io/oauth-secret-version"
consoleImageAnnotation = "console.openshift.io/image"
authnConfigVersionAnnotation = "console.openshift.io/authentication-config-version"
authnCATrustConfigMapResourceVersionAnnotation = "console.openshift.io/authn-ca-trust-config-version"
sessionSecretRVAnnotation = "console.openshift.io/session-secret-version"
)

var (
Expand All @@ -47,7 +46,7 @@ var (
proxyConfigResourceVersionAnnotation,
infrastructureConfigResourceVersionAnnotation,
serviceCAConfigMapResourceVersionAnnotation,
oauthServingCertConfigMapResourceVersionAnnotation,
authnCATrustConfigMapResourceVersionAnnotation,
trustedCAConfigMapResourceVersionAnnotation,
secretResourceVersionAnnotation,
consoleImageAnnotation,
Expand Down Expand Up @@ -77,6 +76,11 @@ func DefaultDeployment(
infrastructureConfig *configv1.Infrastructure,
canMountCustomLogo bool,
) *appsv1.Deployment {
authnCATrustConfigMap := localOAuthServingCertConfigMap
if authnCATrustConfigMap == nil {
authnCATrustConfigMap = authServerCAConfigMap
}

deployment := resourceread.ReadDeploymentV1OrDie(bindata.MustAsset("assets/deployments/console-deployment.yaml"))
withReplicas(deployment, infrastructureConfig)
withAffinity(deployment, infrastructureConfig, "ui")
Expand All @@ -85,13 +89,12 @@ func DefaultDeployment(
deployment,
consoleConfigMap,
serviceCAConfigMap,
localOAuthServingCertConfigMap,
authnCATrustConfigMap,
trustedCAConfigMap,
oAuthClientSecret,
sessionSecret,
proxyConfig,
infrastructureConfig,
authServerCAConfigMap,
)
withConsoleVolumes(
deployment,
Expand Down Expand Up @@ -179,13 +182,12 @@ func withConsoleAnnotations(
deployment *appsv1.Deployment,
consoleConfigMap *corev1.ConfigMap,
serviceCAConfigMap *corev1.ConfigMap,
oauthServingCertConfigMap *corev1.ConfigMap,
authServerCAConfigMap *corev1.ConfigMap,
trustedCAConfigMap *corev1.ConfigMap,
oAuthClientSecret *corev1.Secret,
sessionSecret *corev1.Secret,
proxyConfig *configv1.Proxy,
infrastructureConfig *configv1.Infrastructure,
authServerCAConfigMap *corev1.ConfigMap,
) {
deployment.ObjectMeta.Annotations = map[string]string{
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
Expand All @@ -197,10 +199,6 @@ func withConsoleAnnotations(
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
}

if oauthServingCertConfigMap != nil {
deployment.ObjectMeta.Annotations[oauthServingCertConfigMapResourceVersionAnnotation] = oauthServingCertConfigMap.GetResourceVersion()
}

if authServerCAConfigMap != nil {
deployment.ObjectMeta.Annotations[authnCATrustConfigMapResourceVersionAnnotation] = authServerCAConfigMap.GetResourceVersion()
}
Expand Down
105 changes: 52 additions & 53 deletions pkg/console/subresource/deployment/deployment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ func TestDefaultDeployment(t *testing.T) {
DeletionGracePeriodSeconds: nil,
Labels: labels,
Annotations: map[string]string{
configMapResourceVersionAnnotation: "",
secretResourceVersionAnnotation: "",
oauthServingCertConfigMapResourceVersionAnnotation: "",
serviceCAConfigMapResourceVersionAnnotation: "",
trustedCAConfigMapResourceVersionAnnotation: "",
proxyConfigResourceVersionAnnotation: "",
infrastructureConfigResourceVersionAnnotation: "",
consoleImageAnnotation: "",
configMapResourceVersionAnnotation: "",
secretResourceVersionAnnotation: "",
authnCATrustConfigMapResourceVersionAnnotation: "",
serviceCAConfigMapResourceVersionAnnotation: "",
trustedCAConfigMapResourceVersionAnnotation: "",
proxyConfigResourceVersionAnnotation: "",
infrastructureConfigResourceVersionAnnotation: "",
consoleImageAnnotation: "",
},
OwnerReferences: nil,
Finalizers: nil,
Expand Down Expand Up @@ -123,15 +123,15 @@ func TestDefaultDeployment(t *testing.T) {
}

consoleDeploymentTemplateAnnotations := map[string]string{
configMapResourceVersionAnnotation: "",
secretResourceVersionAnnotation: "",
oauthServingCertConfigMapResourceVersionAnnotation: "",
serviceCAConfigMapResourceVersionAnnotation: "",
trustedCAConfigMapResourceVersionAnnotation: "",
proxyConfigResourceVersionAnnotation: "",
infrastructureConfigResourceVersionAnnotation: "",
consoleImageAnnotation: "",
workloadManagementAnnotation: workloadManagementAnnotationValue,
configMapResourceVersionAnnotation: "",
secretResourceVersionAnnotation: "",
authnCATrustConfigMapResourceVersionAnnotation: "",
serviceCAConfigMapResourceVersionAnnotation: "",
trustedCAConfigMapResourceVersionAnnotation: "",
proxyConfigResourceVersionAnnotation: "",
infrastructureConfigResourceVersionAnnotation: "",
consoleImageAnnotation: "",
workloadManagementAnnotation: workloadManagementAnnotationValue,
}

consoleDeploymentAffinity := &corev1.Affinity{
Expand Down Expand Up @@ -526,17 +526,16 @@ func TestDefaultDeployment(t *testing.T) {

func TestWithConsoleAnnotations(t *testing.T) {
type args struct {
deployment *appsv1.Deployment
consoleConfigMap *corev1.ConfigMap
serviceCAConfigMap *corev1.ConfigMap
oauthServingCertConfigMap *corev1.ConfigMap
trustedCAConfigMap *corev1.ConfigMap
oAuthClientSecret *corev1.Secret
sessionSecret *corev1.Secret
proxyConfig *configv1.Proxy
infrastructureConfig *configv1.Infrastructure
authServerCAConfigMap *corev1.ConfigMap
authnConfig *configv1.Authentication
deployment *appsv1.Deployment
consoleConfigMap *corev1.ConfigMap
serviceCAConfigMap *corev1.ConfigMap
authServerCAConfigMap *corev1.ConfigMap
trustedCAConfigMap *corev1.ConfigMap
oAuthClientSecret *corev1.Secret
sessionSecret *corev1.Secret
proxyConfig *configv1.Proxy
infrastructureConfig *configv1.Infrastructure
authnConfig *configv1.Authentication
}

consoleConfigMap := &corev1.ConfigMap{
Expand Down Expand Up @@ -608,40 +607,40 @@ func TestWithConsoleAnnotations(t *testing.T) {
},
},
},
consoleConfigMap: consoleConfigMap,
serviceCAConfigMap: serviceCAConfigMap,
oauthServingCertConfigMap: oauthServingCertConfigMap,
trustedCAConfigMap: trustedCAConfigMap,
oAuthClientSecret: oAuthClientSecret,
proxyConfig: proxyConfig,
infrastructureConfig: infrastructureConfig,
consoleConfigMap: consoleConfigMap,
serviceCAConfigMap: serviceCAConfigMap,
authServerCAConfigMap: oauthServingCertConfigMap,
trustedCAConfigMap: trustedCAConfigMap,
oAuthClientSecret: oAuthClientSecret,
proxyConfig: proxyConfig,
infrastructureConfig: infrastructureConfig,
},
want: &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
oauthServingCertConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
authnCATrustConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
},
},
Spec: appsv1.DeploymentSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
workloadManagementAnnotation: workloadManagementAnnotationValue,
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
oauthServingCertConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
workloadManagementAnnotation: workloadManagementAnnotationValue,
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
authnCATrustConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
},
},
},
Expand All @@ -651,7 +650,7 @@ func TestWithConsoleAnnotations(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
withConsoleAnnotations(tt.args.deployment, tt.args.consoleConfigMap, tt.args.serviceCAConfigMap, tt.args.oauthServingCertConfigMap, tt.args.trustedCAConfigMap, tt.args.oAuthClientSecret, tt.args.sessionSecret, tt.args.proxyConfig, tt.args.infrastructureConfig, tt.args.authServerCAConfigMap)
withConsoleAnnotations(tt.args.deployment, tt.args.consoleConfigMap, tt.args.serviceCAConfigMap, tt.args.authServerCAConfigMap, tt.args.trustedCAConfigMap, tt.args.oAuthClientSecret, tt.args.sessionSecret, tt.args.proxyConfig, tt.args.infrastructureConfig)
if diff := deep.Equal(tt.args.deployment, tt.want); diff != nil {
t.Error(diff)
}
Expand Down

0 comments on commit 093df36

Please sign in to comment.