Skip to content

Commit 1779ae5

Browse files
committed
Remove oidcMemcacheServers param
1 parent 9a38f8a commit 1779ae5

File tree

5 files changed

+6
-23
lines changed

5 files changed

+6
-23
lines changed

api/bases/keystone.openstack.org_keystoneapis.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,6 @@ spec:
162162
default: ""
163163
description: OIDCIntrospectionEndpoint
164164
type: string
165-
oidcMemCacheServers:
166-
default: ""
167-
description: OIDCMemCacheServers
168-
type: string
169165
oidcPassClaimsAs:
170166
default: both
171167
description: OIDCPassClaimsAs
@@ -190,8 +186,6 @@ spec:
190186
default: HTTP_OIDC_ISS
191187
description: RemoteIDAttribute
192188
type: string
193-
required:
194-
- oidcMemCacheServers
195189
type: object
196190
override:
197191
description: Override, provides the ability to override the generated

api/v1beta1/keystoneapi_types.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,6 @@ type KeystoneFederationSpec struct {
267267
// OIDCCacheType
268268
OIDCCacheType string `json:"oidcCacheType"`
269269

270-
// +kubebuilder:validaton:Optional
271-
// +kubebuilder:default=""
272-
// OIDCMemCacheServers
273-
OIDCMemCacheServers string `json:"oidcMemCacheServers"`
274-
275270
// +kubebuilder:validation:Optional
276271
// +kubebuilder:default="HTTP_OIDC_ISS"
277272
// RemoteIDAttribute

config/crd/bases/keystone.openstack.org_keystoneapis.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,6 @@ spec:
162162
default: ""
163163
description: OIDCIntrospectionEndpoint
164164
type: string
165-
oidcMemCacheServers:
166-
default: ""
167-
description: OIDCMemCacheServers
168-
type: string
169165
oidcPassClaimsAs:
170166
default: both
171167
description: OIDCPassClaimsAs
@@ -190,8 +186,6 @@ spec:
190186
default: HTTP_OIDC_ISS
191187
description: RemoteIDAttribute
192188
type: string
193-
required:
194-
- oidcMemCacheServers
195189
type: object
196190
override:
197191
description: Override, provides the ability to override the generated

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ require (
88
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5
99
github.com/onsi/ginkgo/v2 v2.20.1
1010
github.com/onsi/gomega v1.34.1
11-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241128131522-70981ed1ed1a
11+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241209150727-cbad718905d9
1212
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240213125925-e40975f3db7e
1313
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241114091812-6dc9fd0961dc
1414
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20241114091812-6dc9fd0961dc
1515
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20241114091812-6dc9fd0961dc
16-
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241128102736-6b2a89799960
16+
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241209142852-f7ff11df7e37
1717
go.uber.org/zap v1.27.0
1818
gopkg.in/yaml.v3 v3.0.1
1919
k8s.io/api v0.29.10

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
7878
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
7979
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E=
8080
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
81-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241128131522-70981ed1ed1a h1:A0ryzkskW8hYi0OSBIrpKnSsI80+s934tvw8HhjSlZQ=
82-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241128131522-70981ed1ed1a/go.mod h1:6x5zgJJBjrOhsTtNALYrM2ecUH92kIoZbZ6w1fKHPfs=
81+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241209150727-cbad718905d9 h1:EMeHQ9tArdGwOnJiPWxXlxb4onnMCZCjgpZbYYDG5yg=
82+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241209150727-cbad718905d9/go.mod h1:Fkg09ogWFffMgA5XQzauXDv1bYvyxf9hl4VeHX8O2Tk=
8383
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241114091812-6dc9fd0961dc h1:Ufa/q/nC9wmKblvsc0kJppsXHOJoY4fbUamb3ItWCOk=
8484
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241114091812-6dc9fd0961dc/go.mod h1:YpNTuJhDWhbXM50O3qBkhO7M+OOyRmWkNVmJ4y3cyFs=
8585
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20241114091812-6dc9fd0961dc h1:q68lNZwCrKgLgcakrDu5VtpiWuC1pzQZKlb1M33EPMI=
8686
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20241114091812-6dc9fd0961dc/go.mod h1:IASoGvp5QM/tBJUd/8i8uIjj4DBnI+64Ydh4r7pmnvA=
8787
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20241114091812-6dc9fd0961dc h1:knyjd0eg4DyY+dTDHSrE9QwrZ0mtr7MpASCrmhW+5pw=
8888
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20241114091812-6dc9fd0961dc/go.mod h1:LV0jo5etIsGyINpmB37i4oWR8zU6ApIuh7fsqGGA41o=
89-
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241128102736-6b2a89799960 h1:JKhyJ0JXsdZRoDK53WDMif9tEmx9WFh+PPMb6/Cvkko=
90-
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241128102736-6b2a89799960/go.mod h1:348EPtAdpE2LxHAH4bHdCMNP7HyX6DevwEsF9DQ0S2k=
89+
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241209142852-f7ff11df7e37 h1:dAn6djYwVe4rn1U+KCGTR8k2c3ixZJ1JbzUmtwJ5Itk=
90+
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241209142852-f7ff11df7e37/go.mod h1:348EPtAdpE2LxHAH4bHdCMNP7HyX6DevwEsF9DQ0S2k=
9191
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
9292
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
9393
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

0 commit comments

Comments
 (0)