Skip to content

Commit b30f95c

Browse files
vyzigoldvyzigold
authored
Merge branch 'main' into add-observabilityclient-config
2 parents 744fe8b + 186c8f8 commit b30f95c

27 files changed

+701
-226
lines changed

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

Lines changed: 118 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3529,6 +3529,8 @@ spec:
35293529
type: string
35303530
customServiceConfig:
35313531
type: string
3532+
disableNonTLSListeners:
3533+
type: boolean
35323534
nodeSelector:
35333535
additionalProperties:
35343536
type: string
@@ -3547,6 +3549,13 @@ spec:
35473549
type: string
35483550
storageRequest:
35493551
type: string
3552+
tls:
3553+
properties:
3554+
caBundleSecretName:
3555+
type: string
3556+
secretName:
3557+
type: string
3558+
type: object
35503559
required:
35513560
- containerImage
35523561
- replicas
@@ -5486,6 +5495,13 @@ spec:
54865495
type: object
54875496
secret:
54885497
type: string
5498+
tls:
5499+
properties:
5500+
caBundleSecretName:
5501+
type: string
5502+
secretName:
5503+
type: string
5504+
type: object
54895505
required:
54905506
- containerImage
54915507
- memcachedInstance
@@ -5852,6 +5868,24 @@ spec:
58525868
x-kubernetes-int-or-string: true
58535869
type: object
58545870
type: object
5871+
tls:
5872+
properties:
5873+
api:
5874+
properties:
5875+
internal:
5876+
properties:
5877+
secretName:
5878+
type: string
5879+
type: object
5880+
public:
5881+
properties:
5882+
secretName:
5883+
type: string
5884+
type: object
5885+
type: object
5886+
caBundleSecretName:
5887+
type: string
5888+
type: object
58555889
type: object
58565890
ironicConductors:
58575891
items:
@@ -6110,6 +6144,24 @@ spec:
61106144
type: string
61116145
storageClass:
61126146
type: string
6147+
tls:
6148+
properties:
6149+
api:
6150+
properties:
6151+
internal:
6152+
properties:
6153+
secretName:
6154+
type: string
6155+
type: object
6156+
public:
6157+
properties:
6158+
secretName:
6159+
type: string
6160+
type: object
6161+
type: object
6162+
caBundleSecretName:
6163+
type: string
6164+
type: object
61136165
type: object
61146166
ironicNeutronAgent:
61156167
properties:
@@ -8736,6 +8788,24 @@ spec:
87368788
serviceUser:
87378789
default: neutron
87388790
type: string
8791+
tls:
8792+
properties:
8793+
api:
8794+
properties:
8795+
internal:
8796+
properties:
8797+
secretName:
8798+
type: string
8799+
type: object
8800+
public:
8801+
properties:
8802+
secretName:
8803+
type: string
8804+
type: object
8805+
type: object
8806+
caBundleSecretName:
8807+
type: string
8808+
type: object
87398809
required:
87408810
- containerImage
87418811
- databaseInstance
@@ -9494,18 +9564,6 @@ spec:
94949564
cellMessageBusInstance: rabbitmq-cell1
94959565
hasAPIAccess: true
94969566
type: object
9497-
debug:
9498-
properties:
9499-
preserveJobs:
9500-
default: false
9501-
type: boolean
9502-
stopJob:
9503-
default: false
9504-
type: boolean
9505-
stopService:
9506-
default: false
9507-
type: boolean
9508-
type: object
95099567
keystoneInstance:
95109568
default: keystone
95119569
type: string
@@ -9641,6 +9699,9 @@ spec:
96419699
default: NovaPassword
96429700
type: string
96439701
type: object
9702+
preserveJobs:
9703+
default: false
9704+
type: boolean
96449705
schedulerServiceTemplate:
96459706
default:
96469707
replicas: 1
@@ -15073,6 +15134,13 @@ spec:
1507315134
type: object
1507415135
template:
1507515136
properties:
15137+
memcachedInstance:
15138+
default: memcached
15139+
type: string
15140+
networkAttachments:
15141+
items:
15142+
type: string
15143+
type: array
1507615144
storageClass:
1507715145
default: ""
1507815146
type: string
@@ -15081,10 +15149,15 @@ spec:
1508115149
type: string
1508215150
swiftProxy:
1508315151
properties:
15084-
containerImageMemcached:
15085-
type: string
1508615152
containerImageProxy:
1508715153
type: string
15154+
memcachedServers:
15155+
default: ""
15156+
type: string
15157+
networkAttachments:
15158+
items:
15159+
type: string
15160+
type: array
1508815161
override:
1508915162
properties:
1509015163
service:
@@ -15158,9 +15231,27 @@ spec:
1515815231
swiftConfSecret:
1515915232
default: swift-conf
1516015233
type: string
15234+
tls:
15235+
properties:
15236+
api:
15237+
properties:
15238+
internal:
15239+
properties:
15240+
secretName:
15241+
type: string
15242+
type: object
15243+
public:
15244+
properties:
15245+
secretName:
15246+
type: string
15247+
type: object
15248+
type: object
15249+
caBundleSecretName:
15250+
type: string
15251+
type: object
1516115252
required:
15162-
- containerImageMemcached
1516315253
- containerImageProxy
15254+
- memcachedServers
1516415255
- replicas
1516515256
- secret
1516615257
- serviceUser
@@ -15189,12 +15280,20 @@ spec:
1518915280
type: string
1519015281
containerImageContainer:
1519115282
type: string
15192-
containerImageMemcached:
15193-
type: string
1519415283
containerImageObject:
1519515284
type: string
1519615285
containerImageProxy:
1519715286
type: string
15287+
containerSharderEnabled:
15288+
default: false
15289+
type: boolean
15290+
memcachedServers:
15291+
default: ""
15292+
type: string
15293+
networkAttachments:
15294+
items:
15295+
type: string
15296+
type: array
1519815297
replicas:
1519915298
default: 1
1520015299
format: int32
@@ -15212,15 +15311,16 @@ spec:
1521215311
required:
1521315312
- containerImageAccount
1521415313
- containerImageContainer
15215-
- containerImageMemcached
1521615314
- containerImageObject
1521715315
- containerImageProxy
15316+
- memcachedServers
1521815317
- replicas
1521915318
- storageClass
1522015319
- storageRequest
1522115320
- swiftConfSecret
1522215321
type: object
1522315322
required:
15323+
- memcachedInstance
1522415324
- storageClass
1522515325
- swiftConfSecret
1522615326
- swiftProxy

‎apis/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ func SetupDefaults() {
769769
// Enabled - returns status of tls configuration for the passed in endpoint type
770770
func (t *TLSSection) Enabled(endpt service.Endpoint) bool {
771771
if t != nil {
772-
if cfg, ok := t.Endpoint[service.EndpointInternal]; ok && cfg.Enabled {
772+
if cfg, ok := t.Endpoint[endpt]; ok && cfg.Enabled {
773773
return true
774774
}
775775
}

‎apis/go.mod‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ go 1.19
55
require (
66
github.com/onsi/ginkgo/v2 v2.14.0
77
github.com/onsi/gomega v1.30.0
8-
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240122184042-2a7dc4365ae4
9-
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240125234101-022d50b2f09a
10-
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240104144436-858a0383741c
11-
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5078ec145f59
12-
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
14-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240125112246-15881e3c5305
15-
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240112015156-0cd36db16810
16-
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240125201204-a18a1e700034
17-
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240124141114-55d029e4658b
18-
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240125214002-8d4df0d9e4d6
19-
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240125183550-331c633c453c
20-
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240122135031-be5f0da8fa93
21-
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240126131503-ccdb40976d65
22-
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240116133406-c220c5e98b5e
23-
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240125084018-043c1fc15b4f
8+
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240202095753-a2730987a7d3
9+
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240131135629-5e8e748d6046
10+
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240202095217-b4c677ed4e85
11+
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240201142110-053fb282ede0
12+
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240131060858-f3a662566c58
13+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240201165829-8bf07cefa542
14+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240131221613-02f6fa0ea841
15+
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240201134523-df1ac5ea0807
16+
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240202094933-41f31f2951fb
17+
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240129151020-c9467a8fbbfc
18+
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240130140100-f80cdbcb5e7d
19+
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240201121152-3dcb5d5b24f7
20+
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240131075327-45ee00dc0676
21+
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240202095505-2e8563226272
22+
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240202095506-b8bae01af213
23+
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240131114124-8bdccc638150
2424
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240125124919-72883dc08303
25-
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240125135518-3bd566f845a6
26-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240125213204-be84db57f62f
25+
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240202170409-a34147b1d7d3
26+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240130075809-6609fa1c0732
2727
github.com/rabbitmq/cluster-operator/v2 v2.5.0
2828
k8s.io/apimachinery v0.27.7
2929
sigs.k8s.io/controller-runtime v0.15.1
@@ -69,8 +69,8 @@ require (
6969
github.com/modern-go/reflect2 v1.0.2 // indirect
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7171
github.com/openshift/api v3.9.0+incompatible // indirect
72-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240124141114-55d029e4658b //indirect
73-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240124141114-55d029e4658b
72+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240129151020-c9467a8fbbfc //indirect
73+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240129151020-c9467a8fbbfc
7474
github.com/pkg/errors v0.9.1 // indirect
7575
github.com/prometheus/client_golang v1.16.0 // indirect
7676
github.com/prometheus/client_model v0.4.0 // indirect

0 commit comments

Comments
 (0)