Skip to content

Commit 093df36

Browse files
lioukliouk
committed
deployment: merge auth cert configmap annotations into one
1 parent d390563 commit 093df36

File tree

2 files changed

+70
-73
lines changed

2 files changed

+70
-73
lines changed

‎pkg/console/subresource/deployment/deployment.go‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,16 @@ const (
2828
)
2929

3030
const (
31-
configMapResourceVersionAnnotation = "console.openshift.io/console-config-version"
32-
proxyConfigResourceVersionAnnotation = "console.openshift.io/proxy-config-version"
33-
infrastructureConfigResourceVersionAnnotation = "console.openshift.io/infrastructure-config-version"
34-
serviceCAConfigMapResourceVersionAnnotation = "console.openshift.io/service-ca-config-version"
35-
oauthServingCertConfigMapResourceVersionAnnotation = "console.openshift.io/oauth-serving-cert-config-version"
36-
trustedCAConfigMapResourceVersionAnnotation = "console.openshift.io/trusted-ca-config-version"
37-
secretResourceVersionAnnotation = "console.openshift.io/oauth-secret-version"
38-
consoleImageAnnotation = "console.openshift.io/image"
39-
authnConfigVersionAnnotation = "console.openshift.io/authentication-config-version"
40-
authnCATrustConfigMapResourceVersionAnnotation = "console.openshift.io/authn-ca-trust-config-version"
41-
sessionSecretRVAnnotation = "console.openshift.io/session-secret-version"
31+
configMapResourceVersionAnnotation = "console.openshift.io/console-config-version"
32+
proxyConfigResourceVersionAnnotation = "console.openshift.io/proxy-config-version"
33+
infrastructureConfigResourceVersionAnnotation = "console.openshift.io/infrastructure-config-version"
34+
serviceCAConfigMapResourceVersionAnnotation = "console.openshift.io/service-ca-config-version"
35+
trustedCAConfigMapResourceVersionAnnotation = "console.openshift.io/trusted-ca-config-version"
36+
secretResourceVersionAnnotation = "console.openshift.io/oauth-secret-version"
37+
consoleImageAnnotation = "console.openshift.io/image"
38+
authnConfigVersionAnnotation = "console.openshift.io/authentication-config-version"
39+
authnCATrustConfigMapResourceVersionAnnotation = "console.openshift.io/authn-ca-trust-config-version"
40+
sessionSecretRVAnnotation = "console.openshift.io/session-secret-version"
4241
)
4342

4443
var (
@@ -47,7 +46,7 @@ var (
4746
proxyConfigResourceVersionAnnotation,
4847
infrastructureConfigResourceVersionAnnotation,
4948
serviceCAConfigMapResourceVersionAnnotation,
50-
oauthServingCertConfigMapResourceVersionAnnotation,
49+
authnCATrustConfigMapResourceVersionAnnotation,
5150
trustedCAConfigMapResourceVersionAnnotation,
5251
secretResourceVersionAnnotation,
5352
consoleImageAnnotation,
@@ -77,6 +76,11 @@ func DefaultDeployment(
7776
infrastructureConfig *configv1.Infrastructure,
7877
canMountCustomLogo bool,
7978
) *appsv1.Deployment {
79+
authnCATrustConfigMap := localOAuthServingCertConfigMap
80+
if authnCATrustConfigMap == nil {
81+
authnCATrustConfigMap = authServerCAConfigMap
82+
}
83+
8084
deployment := resourceread.ReadDeploymentV1OrDie(bindata.MustAsset("assets/deployments/console-deployment.yaml"))
8185
withReplicas(deployment, infrastructureConfig)
8286
withAffinity(deployment, infrastructureConfig, "ui")
@@ -85,13 +89,12 @@ func DefaultDeployment(
8589
deployment,
8690
consoleConfigMap,
8791
serviceCAConfigMap,
88-
localOAuthServingCertConfigMap,
92+
authnCATrustConfigMap,
8993
trustedCAConfigMap,
9094
oAuthClientSecret,
9195
sessionSecret,
9296
proxyConfig,
9397
infrastructureConfig,
94-
authServerCAConfigMap,
9598
)
9699
withConsoleVolumes(
97100
deployment,
@@ -179,13 +182,12 @@ func withConsoleAnnotations(
179182
deployment *appsv1.Deployment,
180183
consoleConfigMap *corev1.ConfigMap,
181184
serviceCAConfigMap *corev1.ConfigMap,
182-
oauthServingCertConfigMap *corev1.ConfigMap,
185+
authServerCAConfigMap *corev1.ConfigMap,
183186
trustedCAConfigMap *corev1.ConfigMap,
184187
oAuthClientSecret *corev1.Secret,
185188
sessionSecret *corev1.Secret,
186189
proxyConfig *configv1.Proxy,
187190
infrastructureConfig *configv1.Infrastructure,
188-
authServerCAConfigMap *corev1.ConfigMap,
189191
) {
190192
deployment.ObjectMeta.Annotations = map[string]string{
191193
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
@@ -197,10 +199,6 @@ func withConsoleAnnotations(
197199
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
198200
}
199201

200-
if oauthServingCertConfigMap != nil {
201-
deployment.ObjectMeta.Annotations[oauthServingCertConfigMapResourceVersionAnnotation] = oauthServingCertConfigMap.GetResourceVersion()
202-
}
203-
204202
if authServerCAConfigMap != nil {
205203
deployment.ObjectMeta.Annotations[authnCATrustConfigMapResourceVersionAnnotation] = authServerCAConfigMap.GetResourceVersion()
206204
}

‎pkg/console/subresource/deployment/deployment_test.go‎

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ func TestDefaultDeployment(t *testing.T) {
7373
DeletionGracePeriodSeconds: nil,
7474
Labels: labels,
7575
Annotations: map[string]string{
76-
configMapResourceVersionAnnotation: "",
77-
secretResourceVersionAnnotation: "",
78-
oauthServingCertConfigMapResourceVersionAnnotation: "",
79-
serviceCAConfigMapResourceVersionAnnotation: "",
80-
trustedCAConfigMapResourceVersionAnnotation: "",
81-
proxyConfigResourceVersionAnnotation: "",
82-
infrastructureConfigResourceVersionAnnotation: "",
83-
consoleImageAnnotation: "",
76+
configMapResourceVersionAnnotation: "",
77+
secretResourceVersionAnnotation: "",
78+
authnCATrustConfigMapResourceVersionAnnotation: "",
79+
serviceCAConfigMapResourceVersionAnnotation: "",
80+
trustedCAConfigMapResourceVersionAnnotation: "",
81+
proxyConfigResourceVersionAnnotation: "",
82+
infrastructureConfigResourceVersionAnnotation: "",
83+
consoleImageAnnotation: "",
8484
},
8585
OwnerReferences: nil,
8686
Finalizers: nil,
@@ -123,15 +123,15 @@ func TestDefaultDeployment(t *testing.T) {
123123
}
124124

125125
consoleDeploymentTemplateAnnotations := map[string]string{
126-
configMapResourceVersionAnnotation: "",
127-
secretResourceVersionAnnotation: "",
128-
oauthServingCertConfigMapResourceVersionAnnotation: "",
129-
serviceCAConfigMapResourceVersionAnnotation: "",
130-
trustedCAConfigMapResourceVersionAnnotation: "",
131-
proxyConfigResourceVersionAnnotation: "",
132-
infrastructureConfigResourceVersionAnnotation: "",
133-
consoleImageAnnotation: "",
134-
workloadManagementAnnotation: workloadManagementAnnotationValue,
126+
configMapResourceVersionAnnotation: "",
127+
secretResourceVersionAnnotation: "",
128+
authnCATrustConfigMapResourceVersionAnnotation: "",
129+
serviceCAConfigMapResourceVersionAnnotation: "",
130+
trustedCAConfigMapResourceVersionAnnotation: "",
131+
proxyConfigResourceVersionAnnotation: "",
132+
infrastructureConfigResourceVersionAnnotation: "",
133+
consoleImageAnnotation: "",
134+
workloadManagementAnnotation: workloadManagementAnnotationValue,
135135
}
136136

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

527527
func TestWithConsoleAnnotations(t *testing.T) {
528528
type args struct {
529-
deployment *appsv1.Deployment
530-
consoleConfigMap *corev1.ConfigMap
531-
serviceCAConfigMap *corev1.ConfigMap
532-
oauthServingCertConfigMap *corev1.ConfigMap
533-
trustedCAConfigMap *corev1.ConfigMap
534-
oAuthClientSecret *corev1.Secret
535-
sessionSecret *corev1.Secret
536-
proxyConfig *configv1.Proxy
537-
infrastructureConfig *configv1.Infrastructure
538-
authServerCAConfigMap *corev1.ConfigMap
539-
authnConfig *configv1.Authentication
529+
deployment *appsv1.Deployment
530+
consoleConfigMap *corev1.ConfigMap
531+
serviceCAConfigMap *corev1.ConfigMap
532+
authServerCAConfigMap *corev1.ConfigMap
533+
trustedCAConfigMap *corev1.ConfigMap
534+
oAuthClientSecret *corev1.Secret
535+
sessionSecret *corev1.Secret
536+
proxyConfig *configv1.Proxy
537+
infrastructureConfig *configv1.Infrastructure
538+
authnConfig *configv1.Authentication
540539
}
541540

542541
consoleConfigMap := &corev1.ConfigMap{
@@ -608,40 +607,40 @@ func TestWithConsoleAnnotations(t *testing.T) {
608607
},
609608
},
610609
},
611-
consoleConfigMap: consoleConfigMap,
612-
serviceCAConfigMap: serviceCAConfigMap,
613-
oauthServingCertConfigMap: oauthServingCertConfigMap,
614-
trustedCAConfigMap: trustedCAConfigMap,
615-
oAuthClientSecret: oAuthClientSecret,
616-
proxyConfig: proxyConfig,
617-
infrastructureConfig: infrastructureConfig,
610+
consoleConfigMap: consoleConfigMap,
611+
serviceCAConfigMap: serviceCAConfigMap,
612+
authServerCAConfigMap: oauthServingCertConfigMap,
613+
trustedCAConfigMap: trustedCAConfigMap,
614+
oAuthClientSecret: oAuthClientSecret,
615+
proxyConfig: proxyConfig,
616+
infrastructureConfig: infrastructureConfig,
618617
},
619618
want: &appsv1.Deployment{
620619
ObjectMeta: metav1.ObjectMeta{
621620
Annotations: map[string]string{
622-
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
623-
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
624-
oauthServingCertConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
625-
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
626-
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
627-
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
628-
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
629-
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
621+
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
622+
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
623+
authnCATrustConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
624+
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
625+
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
626+
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
627+
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
628+
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
630629
},
631630
},
632631
Spec: appsv1.DeploymentSpec{
633632
Template: corev1.PodTemplateSpec{
634633
ObjectMeta: metav1.ObjectMeta{
635634
Annotations: map[string]string{
636-
workloadManagementAnnotation: workloadManagementAnnotationValue,
637-
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
638-
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
639-
oauthServingCertConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
640-
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
641-
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
642-
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
643-
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
644-
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
635+
workloadManagementAnnotation: workloadManagementAnnotationValue,
636+
configMapResourceVersionAnnotation: consoleConfigMap.GetResourceVersion(),
637+
serviceCAConfigMapResourceVersionAnnotation: serviceCAConfigMap.GetResourceVersion(),
638+
authnCATrustConfigMapResourceVersionAnnotation: oauthServingCertConfigMap.GetResourceVersion(),
639+
trustedCAConfigMapResourceVersionAnnotation: trustedCAConfigMap.GetResourceVersion(),
640+
proxyConfigResourceVersionAnnotation: proxyConfig.GetResourceVersion(),
641+
infrastructureConfigResourceVersionAnnotation: infrastructureConfig.GetResourceVersion(),
642+
secretResourceVersionAnnotation: oAuthClientSecret.GetResourceVersion(),
643+
consoleImageAnnotation: util.GetImageEnv("CONSOLE_IMAGE"),
645644
},
646645
},
647646
},
@@ -651,7 +650,7 @@ func TestWithConsoleAnnotations(t *testing.T) {
651650
}
652651
for _, tt := range tests {
653652
t.Run(tt.name, func(t *testing.T) {
654-
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)
653+
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)
655654
if diff := deep.Equal(tt.args.deployment, tt.want); diff != nil {
656655
t.Error(diff)
657656
}

0 commit comments

Comments
 (0)