Skip to content

Commit 06e9d50

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1143 from olliewalsh/keystone_bump
Update keystone operator
2 parents ab44f01 + b541eaf commit 06e9d50

File tree

6 files changed

+26
-6
lines changed

6 files changed

+26
-6
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7273,6 +7273,16 @@ spec:
72737273
enableSecureRBAC:
72747274
default: true
72757275
type: boolean
7276+
fernetMaxActiveKeys:
7277+
default: 5
7278+
format: int32
7279+
minimum: 3
7280+
type: integer
7281+
fernetRotationDays:
7282+
default: 1
7283+
format: int32
7284+
minimum: 1
7285+
type: integer
72767286
memcachedInstance:
72777287
default: memcached
72787288
type: string

‎apis/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/horizon-operator/api v0.4.1-0.20241017085952-cdfbe98abf09
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20241016181319-b9247e58df93
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241017064109-f3611e3838bc
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241018180515-61e711f07467
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20241014140317-e5c35d28f3af
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20241014140317-e5c35d28f3af
2121
github.com/openstack-k8s-operators/manila-operator/api v0.4.1-0.20241016213652-f06ae482a4bf

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20241016181319-b
110110
github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20241016181319-b9247e58df93/go.mod h1:J9oUh3eGBvAFfyUMiPxPRBSxAcO8rnwITN4RTh/It+8=
111111
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a h1:yTFMBAdgnoGnPAjHsm35DXmE40U1LarB4YF7agT4jws=
112112
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a/go.mod h1:qxdXTRt7kY6orSnFc/OTRHtqElNPuMV0W0KvMPHbE2s=
113-
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241017064109-f3611e3838bc h1:yaNDlDWnsODUWjMWeuC6ORoSHjXPT0YPFA/2poXRKFw=
114-
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241017064109-f3611e3838bc/go.mod h1:saoorrsPo3DzDPGM6PJ8sQJBNuNRGCHjRHChRQmkoQ0=
113+
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241018180515-61e711f07467 h1:AJVVQrnWg2o/dVOgu++oHBMFxFe27R/a52qGGjxviRc=
114+
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241018180515-61e711f07467/go.mod h1:saoorrsPo3DzDPGM6PJ8sQJBNuNRGCHjRHChRQmkoQ0=
115115
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20241014140317-e5c35d28f3af h1:MNNuYPfaXWf14lfsWGay3WjLjIIu9KN5+iHrLdCMQac=
116116
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20241014140317-e5c35d28f3af/go.mod h1:EKfyFMU2brJYqR4M2Hwfo5ZLBQxAJXAYfHjpdqX6N5g=
117117
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20241014140317-e5c35d28f3af h1:fevDUHmqcnI4wDTKupKe/CcgVdgNpZXWkJx8u0/xEXs=

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7273,6 +7273,16 @@ spec:
72737273
enableSecureRBAC:
72747274
default: true
72757275
type: boolean
7276+
fernetMaxActiveKeys:
7277+
default: 5
7278+
format: int32
7279+
minimum: 3
7280+
type: integer
7281+
fernetRotationDays:
7282+
default: 1
7283+
format: int32
7284+
minimum: 1
7285+
type: integer
72767286
memcachedInstance:
72777287
default: memcached
72787288
type: string

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.4.1-0.20241017085952-cdfbe98abf09
2121
github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20241016181319-b9247e58df93
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a
23-
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241017064109-f3611e3838bc
23+
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241018180515-61e711f07467
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.4.1-0.20241014140317-e5c35d28f3af
2525
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20241014140317-e5c35d28f3af
2626
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20241014140317-e5c35d28f3af

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20241016181319-b
116116
github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20241016181319-b9247e58df93/go.mod h1:J9oUh3eGBvAFfyUMiPxPRBSxAcO8rnwITN4RTh/It+8=
117117
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a h1:yTFMBAdgnoGnPAjHsm35DXmE40U1LarB4YF7agT4jws=
118118
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a/go.mod h1:qxdXTRt7kY6orSnFc/OTRHtqElNPuMV0W0KvMPHbE2s=
119-
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241017064109-f3611e3838bc h1:yaNDlDWnsODUWjMWeuC6ORoSHjXPT0YPFA/2poXRKFw=
120-
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241017064109-f3611e3838bc/go.mod h1:saoorrsPo3DzDPGM6PJ8sQJBNuNRGCHjRHChRQmkoQ0=
119+
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241018180515-61e711f07467 h1:AJVVQrnWg2o/dVOgu++oHBMFxFe27R/a52qGGjxviRc=
120+
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20241018180515-61e711f07467/go.mod h1:saoorrsPo3DzDPGM6PJ8sQJBNuNRGCHjRHChRQmkoQ0=
121121
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.4.1-0.20241014140317-e5c35d28f3af h1:IUXjVQiMxafC9Rgg9qnmTrcYmKMqQOepxnGIz4ewOIM=
122122
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.4.1-0.20241014140317-e5c35d28f3af/go.mod h1:FxA/2ChDnVKgbZAyiiRLDGZB7WMcrHlOMBZYUQGgRf0=
123123
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20241014140317-e5c35d28f3af h1:LDXTllkvWjQX+GXgA3hP2qMtdwA/Bf2DYZ091uYh0Hk=

0 commit comments

Comments
 (0)