Skip to content

Commit 0011d78

Browse files
olliewalsholliewalsh
committed
[tlse] tls for Horizon
Creates certs for horizon k8s service and pods when spec.tls.endpoint.internal.enabled: true Jira: OSPRH-4392
1 parent 50591b2 commit 0011d78

File tree

7 files changed

+29
-7
lines changed

7 files changed

+29
-7
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5486,6 +5486,13 @@ spec:
54865486
type: object
54875487
secret:
54885488
type: string
5489+
tls:
5490+
properties:
5491+
caBundleSecretName:
5492+
type: string
5493+
secretName:
5494+
type: string
5495+
type: object
54895496
required:
54905497
- containerImage
54915498
- memcachedInstance

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240104144436-858a0383741c
1111
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5078ec145f59
1212
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240126104104-98b57e66f7b5
13-
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240107213124-f2df1172f89e
13+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240201165829-8bf07cefa542
1414
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240131020128-fea7453a8039
1515
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240201134523-df1ac5ea0807
1616
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240125201204-a18a1e700034

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5
140140
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5078ec145f59/go.mod h1:s1zOUVnG8X7O3MuymRC/BhbOCn5ZjU7FrfX4wOnQs6E=
141141
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240126104104-98b57e66f7b5 h1:3OXMNE58GsoH4oik991Jw90zyyC0c4HwtdLXinVtCvA=
142142
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240126104104-98b57e66f7b5/go.mod h1:uELus2W9VhyxtcByNyUgNZyTH2qpcJH4c7FZz6SOI/I=
143-
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240107213124-f2df1172f89e h1:GbIGvapn+D/fDvK8IoxVbgCLaTxD3OwtYe9PQ9DdVy0=
144-
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240107213124-f2df1172f89e/go.mod h1:5U3y8EfcYL21ipAXxPgVMSSfSOdCRN0wNmh0L7aREKw=
143+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240201165829-8bf07cefa542 h1:5JgxlBCmPGDSv7FKv3ZGnuAwr2PFVyRNNmf/UfGVoIk=
144+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240201165829-8bf07cefa542/go.mod h1:vqtXw4Sj2MOZgVP2Kzs1WK2sPweTyhYmwVZau7kc96s=
145145
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240131020128-fea7453a8039 h1:z48vu+NVNS2Pt5Pv0DLSUpTFfb1nqb8jweC2ZRurNlw=
146146
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240131020128-fea7453a8039/go.mod h1:M3859LWhTb+9zahzU3nhkrwUBvAgTmLPaG10haK9djM=
147147
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240201134523-df1ac5ea0807 h1:pCGPzFAo85glN8ApN45uyxQ8uaOPCDQYdfF2Kh0ReK8=

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5486,6 +5486,13 @@ spec:
54865486
type: object
54875487
secret:
54885488
type: string
5489+
tls:
5490+
properties:
5491+
caBundleSecretName:
5492+
type: string
5493+
secretName:
5494+
type: string
5495+
type: object
54895496
required:
54905497
- containerImage
54915498
- memcachedInstance

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240104144436-858a0383741c
1616
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5078ec145f59
1717
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240126104104-98b57e66f7b5
18-
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240107213124-f2df1172f89e
18+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240201165829-8bf07cefa542
1919
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240131020128-fea7453a8039
2020
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240201134523-df1ac5ea0807
2121
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240125201204-a18a1e700034

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5
153153
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5078ec145f59/go.mod h1:s1zOUVnG8X7O3MuymRC/BhbOCn5ZjU7FrfX4wOnQs6E=
154154
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240126104104-98b57e66f7b5 h1:3OXMNE58GsoH4oik991Jw90zyyC0c4HwtdLXinVtCvA=
155155
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240126104104-98b57e66f7b5/go.mod h1:uELus2W9VhyxtcByNyUgNZyTH2qpcJH4c7FZz6SOI/I=
156-
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240107213124-f2df1172f89e h1:GbIGvapn+D/fDvK8IoxVbgCLaTxD3OwtYe9PQ9DdVy0=
157-
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240107213124-f2df1172f89e/go.mod h1:5U3y8EfcYL21ipAXxPgVMSSfSOdCRN0wNmh0L7aREKw=
156+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240201165829-8bf07cefa542 h1:5JgxlBCmPGDSv7FKv3ZGnuAwr2PFVyRNNmf/UfGVoIk=
157+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240201165829-8bf07cefa542/go.mod h1:vqtXw4Sj2MOZgVP2Kzs1WK2sPweTyhYmwVZau7kc96s=
158158
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240131020128-fea7453a8039 h1:z48vu+NVNS2Pt5Pv0DLSUpTFfb1nqb8jweC2ZRurNlw=
159159
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240131020128-fea7453a8039/go.mod h1:M3859LWhTb+9zahzU3nhkrwUBvAgTmLPaG10haK9djM=
160160
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240201134523-df1ac5ea0807 h1:pCGPzFAo85glN8ApN45uyxQ8uaOPCDQYdfF2Kh0ReK8=

‎pkg/openstack/horizon.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro
6767
}
6868
}
6969

70+
// preserve any previously set TLS certs, set CA cert
71+
if instance.Spec.TLS.Enabled(service.EndpointInternal) {
72+
instance.Spec.Horizon.Template.TLS = horizon.Spec.TLS
73+
}
74+
instance.Spec.Horizon.Template.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
75+
7076
if horizon.Status.Conditions.IsTrue(condition.ExposeServiceReadyCondition) {
7177
svcs, err := service.GetServicesListWithLabel(
7278
ctx,
@@ -87,14 +93,16 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro
8793
serviceOverrides,
8894
instance.Spec.Horizon.APIOverride,
8995
corev1beta1.OpenStackControlPlaneExposeHorizonReadyCondition,
90-
true, // TODO: (mschuppert) disable TLS for now until implemented
96+
false, // TODO (mschuppert) could be removed when all integrated service support TLS
9197
)
9298
if err != nil {
9399
return ctrlResult, err
94100
} else if (ctrlResult != ctrl.Result{}) {
95101
return ctrlResult, nil
96102
}
97103
serviceOverrides = endpointDetails.GetEndpointServiceOverrides()
104+
105+
instance.Spec.Horizon.Template.TLS.SecretName = endpointDetails.GetEndptCertSecret(service.EndpointPublic)
98106
}
99107

100108
Log.Info("Reconcile Horizon", "horizon.Namespace", instance.Namespace, "horizon.Name", "horizon")

0 commit comments

Comments
 (0)