Skip to content

Commit

Permalink
[wip] glance
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuggi
stuggi committed Nov 23, 2023
1 parent 40229cd commit 5141654
Show file tree
Hide file tree
Showing 9 changed files with 138 additions and 65 deletions.
24 changes: 24 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4211,6 +4211,30 @@ spec:
type: string
storageRequest:
type: string
tls:
properties:
api:
properties:
disabled:
type: boolean
endpoint:
additionalProperties:
properties:
issuerName:
type: string
secretName:
type: string
type: object
type: object
type: object
caBundleSecretName:
type: string
db:
properties:
disabled:
type: boolean
type: object
type: object
required:
- containerImage
- databaseInstance
Expand Down
13 changes: 7 additions & 6 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,12 @@ require (
)

replace ( //allow-merging
github.com/google/gnostic => github.com/google/gnostic v0.6.9
// pin to k8s 0.26.x for now
k8s.io/api => k8s.io/api v0.26.9
k8s.io/apimachinery => k8s.io/apimachinery v0.26.9
k8s.io/client-go => k8s.io/client-go v0.26.9
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.6
k8s.io/api => k8s.io/api v0.26.11
k8s.io/apimachinery => k8s.io/apimachinery v0.26.11
k8s.io/client-go => k8s.io/client-go v0.26.11
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.7
)

// mschuppert: map to latest commit from release-4.13 tag
Expand All @@ -116,6 +117,6 @@ replace golang.org/x/net => golang.org/x/net v0.18.0 //allow-merging

replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20231121162511-6268af447388

replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/stuggi/keystone-operator/api v0.0.0-20231121163006-f26b0a96f2dc
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/stuggi/keystone-operator/api v0.0.0-20231122111005-25dd04e775e6

//replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20231121165522-d1f4805f119b
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20231123082922-572dce034b6a
24 changes: 12 additions & 12 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a/go.mod h1:wV6KRR6y+QCJf5R6nQ7dSRQenKEFWV6TIHWhh9wTbMc=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986 h1:m4h3nNtLYab80h3ke5HbSNFW/TMw01F2LFICDD2v5uk=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986/go.mod h1:Omznf+d4Vgt1Iv1X/37QN8OiXUcdD35uLoo2CL7b+2Y=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231117074407-25683ec68a7f h1:URkVBGpE+41NIjblYT56GH9XqOWmgMjrLLjwHziIyOw=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231117074407-25683ec68a7f/go.mod h1:eReQts/riwvD+SYZxLHL4bRNUDyXOEmy1BWopjPErqc=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641 h1:cUDgIWqHAz8iJva/s9U/PDJJiWrZcJxZuDbRRwgQLX4=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641/go.mod h1:onZi7lv87FrDrL8GfNblZCntw+mZHfvhP8AyWoV8yTs=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a h1:AUc7G9r/EGzYrfadt6Ys4UnX0aCHBFiYMbym9a1I6to=
Expand Down Expand Up @@ -201,8 +199,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stuggi/keystone-operator/api v0.0.0-20231121163006-f26b0a96f2dc h1:WYcJ8i9SbLuR43E+NqMWXiYJSjBPHakwrfeb5jeQUE4=
github.com/stuggi/keystone-operator/api v0.0.0-20231121163006-f26b0a96f2dc/go.mod h1:WyPUDzyxBwB/kd0uo1e72AO8ToyPMptsh1f4xYgU8zs=
github.com/stuggi/glance-operator/api v0.0.0-20231123082922-572dce034b6a h1:x8BrpfGbqbHthZ5+4sn3E5Ex3aybHQQBvJ7180qvFbc=
github.com/stuggi/glance-operator/api v0.0.0-20231123082922-572dce034b6a/go.mod h1:ZfyUFpExpnrUhbMy99OTsEIBQ06EeRI/5sPQ8WqIMaM=
github.com/stuggi/keystone-operator/api v0.0.0-20231122111005-25dd04e775e6 h1:/eZMLz0ZYeTeJ25K5nWZEw6+PBijwllATJoCEBs+QaU=
github.com/stuggi/keystone-operator/api v0.0.0-20231122111005-25dd04e775e6/go.mod h1:WyPUDzyxBwB/kd0uo1e72AO8ToyPMptsh1f4xYgU8zs=
github.com/stuggi/lib-common/modules/common v0.0.0-20231121162511-6268af447388 h1:n+hQBWtzwP3OaYaOigQB9w1TZNwdTY1U80EKcuvdAfk=
github.com/stuggi/lib-common/modules/common v0.0.0-20231121162511-6268af447388/go.mod h1:ImxqioQ1ID+d7fMMD4lK8CxJqNTB5tsQ+lGKcN/xx5M=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
Expand Down Expand Up @@ -346,14 +346,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.26.9 h1:s8Y+G1u2JM55b90+Yo2RVb3PGT/hkWNVPN4idPERxJg=
k8s.io/api v0.26.9/go.mod h1:W/W4fEWRVzPD36820LlVUQfNBiSbiq0VPWRFJKwzmUg=
k8s.io/api v0.26.11 h1:hLhTZRdYc3vBBOY4wbEyTLWgMyieOAk2Ws9NG57QqO4=
k8s.io/api v0.26.11/go.mod h1:bSr/A0TKRt5W2OMDdexkM/ER1NxOxiQqNNFXW2nMZrM=
k8s.io/apiextensions-apiserver v0.28.1 h1:l2ThkBRjrWpw4f24uq0Da2HaEgqJZ7pcgiEUTKSmQZw=
k8s.io/apiextensions-apiserver v0.28.1/go.mod h1:sVvrI+P4vxh2YBBcm8n2ThjNyzU4BQGilCQ/JAY5kGs=
k8s.io/apimachinery v0.26.9 h1:5yAV9cFR7Z4gIorKcAjWnx4uxtxiFsERwq4Pvmx0CCg=
k8s.io/apimachinery v0.26.9/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/client-go v0.26.9 h1:TGWi/6guEjIgT0Hg871Gsmx0qFuoGyGFjlFedrk7It0=
k8s.io/client-go v0.26.9/go.mod h1:tU1FZS0bwAmAFyPYpZycUQrQnUMzQ5MHloop7EbX6ow=
k8s.io/apimachinery v0.26.11 h1:w//840HHdwSRKqD15j9YX9HLlU6RPlfrvW0xEhLk2+0=
k8s.io/apimachinery v0.26.11/go.mod h1:2/HZp0l6coXtS26du1Bk36fCuAEr/lVs9Q9NbpBtd1Y=
k8s.io/client-go v0.26.11 h1:RjfZr5+vQjjTRmk4oCqHyC0cgrZXPjw+X+ge35sk4GI=
k8s.io/client-go v0.26.11/go.mod h1:+emNszw9va/uRJIM5ALTBtFnlZMTjwBrNjRfEh0iuw8=
k8s.io/component-base v0.28.1 h1:LA4AujMlK2mr0tZbQDZkjWbdhTV5bRyEyAFe0TJxlWg=
k8s.io/component-base v0.28.1/go.mod h1:jI11OyhbX21Qtbav7JkhehyBsIRfnO8oEgoAR12ArIU=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
Expand All @@ -362,8 +362,8 @@ k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f h1:eeEUOoGYWhOz7EyXqhlR2z
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA=
sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
sigs.k8s.io/controller-runtime v0.14.7 h1:Vrnm2vk9ZFlRkXATHz0W0wXcqNl7kPat8q2JyxVy0Q8=
sigs.k8s.io/controller-runtime v0.14.7/go.mod h1:ErTs3SJCOujNUnTz4AS+uh8hp6DHMo1gj6fFndJT1X8=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
Expand Down
24 changes: 24 additions & 0 deletions config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4211,6 +4211,30 @@ spec:
type: string
storageRequest:
type: string
tls:
properties:
api:
properties:
disabled:
type: boolean
endpoint:
additionalProperties:
properties:
issuerName:
type: string
secretName:
type: string
type: object
type: object
type: object
caBundleSecretName:
type: string
db:
properties:
disabled:
type: boolean
type: object
type: object
required:
- containerImage
- databaseInstance
Expand Down
17 changes: 10 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ require (
require (
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 // indirect
github.com/metal3-io/baremetal-operator/apis v0.3.1 // indirect
Expand Down Expand Up @@ -116,11 +115,15 @@ require (
)

replace ( //allow-merging
github.com/cert-manager/cert-manager => github.com/cert-manager/cert-manager v1.11.5
github.com/google/gnostic => github.com/google/gnostic v0.6.9
// pin to k8s 0.26.x for now
k8s.io/api => k8s.io/api v0.26.9
k8s.io/apimachinery => k8s.io/apimachinery v0.26.9
k8s.io/client-go => k8s.io/client-go v0.26.9
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.6
k8s.io/api => k8s.io/api v0.26.11
k8s.io/apimachinery => k8s.io/apimachinery v0.26.11
k8s.io/client-go => k8s.io/client-go v0.26.11
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.7
sigs.k8s.io/gateway-api => sigs.k8s.io/gateway-api v0.6.0
)

// Bump golang.org/x/net to avoid Rapid Reset CVE
Expand All @@ -134,6 +137,6 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430

replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20231121162511-6268af447388

replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/stuggi/keystone-operator/api v0.0.0-20231121163006-f26b0a96f2dc
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/stuggi/keystone-operator/api v0.0.0-20231122111005-25dd04e775e6

//replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20231121165522-d1f4805f119b
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20231123082922-572dce034b6a
30 changes: 14 additions & 16 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
Expand Down Expand Up @@ -149,8 +147,6 @@ github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.2023112005151
github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231120051517-d5780483eee7/go.mod h1:1dZrgUfVa6uoR9MO8X0FOdk67porLAkQUSxHrJLtg10=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986 h1:m4h3nNtLYab80h3ke5HbSNFW/TMw01F2LFICDD2v5uk=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986/go.mod h1:Omznf+d4Vgt1Iv1X/37QN8OiXUcdD35uLoo2CL7b+2Y=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231117074407-25683ec68a7f h1:URkVBGpE+41NIjblYT56GH9XqOWmgMjrLLjwHziIyOw=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231117074407-25683ec68a7f/go.mod h1:eReQts/riwvD+SYZxLHL4bRNUDyXOEmy1BWopjPErqc=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641 h1:cUDgIWqHAz8iJva/s9U/PDJJiWrZcJxZuDbRRwgQLX4=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641/go.mod h1:onZi7lv87FrDrL8GfNblZCntw+mZHfvhP8AyWoV8yTs=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231103160944-413a8b455a4a h1:AUc7G9r/EGzYrfadt6Ys4UnX0aCHBFiYMbym9a1I6to=
Expand Down Expand Up @@ -226,8 +222,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stuggi/keystone-operator/api v0.0.0-20231121163006-f26b0a96f2dc h1:WYcJ8i9SbLuR43E+NqMWXiYJSjBPHakwrfeb5jeQUE4=
github.com/stuggi/keystone-operator/api v0.0.0-20231121163006-f26b0a96f2dc/go.mod h1:WyPUDzyxBwB/kd0uo1e72AO8ToyPMptsh1f4xYgU8zs=
github.com/stuggi/glance-operator/api v0.0.0-20231123082922-572dce034b6a h1:x8BrpfGbqbHthZ5+4sn3E5Ex3aybHQQBvJ7180qvFbc=
github.com/stuggi/glance-operator/api v0.0.0-20231123082922-572dce034b6a/go.mod h1:ZfyUFpExpnrUhbMy99OTsEIBQ06EeRI/5sPQ8WqIMaM=
github.com/stuggi/keystone-operator/api v0.0.0-20231122111005-25dd04e775e6 h1:/eZMLz0ZYeTeJ25K5nWZEw6+PBijwllATJoCEBs+QaU=
github.com/stuggi/keystone-operator/api v0.0.0-20231122111005-25dd04e775e6/go.mod h1:WyPUDzyxBwB/kd0uo1e72AO8ToyPMptsh1f4xYgU8zs=
github.com/stuggi/lib-common/modules/common v0.0.0-20231121162511-6268af447388 h1:n+hQBWtzwP3OaYaOigQB9w1TZNwdTY1U80EKcuvdAfk=
github.com/stuggi/lib-common/modules/common v0.0.0-20231121162511-6268af447388/go.mod h1:ImxqioQ1ID+d7fMMD4lK8CxJqNTB5tsQ+lGKcN/xx5M=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
Expand Down Expand Up @@ -373,24 +371,24 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.26.9 h1:s8Y+G1u2JM55b90+Yo2RVb3PGT/hkWNVPN4idPERxJg=
k8s.io/api v0.26.9/go.mod h1:W/W4fEWRVzPD36820LlVUQfNBiSbiq0VPWRFJKwzmUg=
k8s.io/api v0.26.11 h1:hLhTZRdYc3vBBOY4wbEyTLWgMyieOAk2Ws9NG57QqO4=
k8s.io/api v0.26.11/go.mod h1:bSr/A0TKRt5W2OMDdexkM/ER1NxOxiQqNNFXW2nMZrM=
k8s.io/apiextensions-apiserver v0.28.1 h1:l2ThkBRjrWpw4f24uq0Da2HaEgqJZ7pcgiEUTKSmQZw=
k8s.io/apiextensions-apiserver v0.28.1/go.mod h1:sVvrI+P4vxh2YBBcm8n2ThjNyzU4BQGilCQ/JAY5kGs=
k8s.io/apimachinery v0.26.9 h1:5yAV9cFR7Z4gIorKcAjWnx4uxtxiFsERwq4Pvmx0CCg=
k8s.io/apimachinery v0.26.9/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/client-go v0.26.9 h1:TGWi/6guEjIgT0Hg871Gsmx0qFuoGyGFjlFedrk7It0=
k8s.io/client-go v0.26.9/go.mod h1:tU1FZS0bwAmAFyPYpZycUQrQnUMzQ5MHloop7EbX6ow=
k8s.io/apimachinery v0.26.11 h1:w//840HHdwSRKqD15j9YX9HLlU6RPlfrvW0xEhLk2+0=
k8s.io/apimachinery v0.26.11/go.mod h1:2/HZp0l6coXtS26du1Bk36fCuAEr/lVs9Q9NbpBtd1Y=
k8s.io/client-go v0.26.11 h1:RjfZr5+vQjjTRmk4oCqHyC0cgrZXPjw+X+ge35sk4GI=
k8s.io/client-go v0.26.11/go.mod h1:+emNszw9va/uRJIM5ALTBtFnlZMTjwBrNjRfEh0iuw8=
k8s.io/component-base v0.28.1 h1:LA4AujMlK2mr0tZbQDZkjWbdhTV5bRyEyAFe0TJxlWg=
k8s.io/component-base v0.28.1/go.mod h1:jI11OyhbX21Qtbav7JkhehyBsIRfnO8oEgoAR12ArIU=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f h1:eeEUOoGYWhOz7EyXqhlR2zHKNw2mNJ9vzJmub6YN6kk=
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c h1:EFfsozyzZ/pggw5qNx7ftTVZdp7WZl+3ih89GEjYEK8=
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA=
sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
sigs.k8s.io/controller-runtime v0.14.7 h1:Vrnm2vk9ZFlRkXATHz0W0wXcqNl7kPat8q2JyxVy0Q8=
sigs.k8s.io/controller-runtime v0.14.7/go.mod h1:ErTs3SJCOujNUnTz4AS+uh8hp6DHMo1gj6fFndJT1X8=
sigs.k8s.io/gateway-api v0.6.0 h1:v2FqrN2ROWZLrSnI2o91taHR8Sj3s+Eh3QU7gLNWIqA=
sigs.k8s.io/gateway-api v0.6.0/go.mod h1:EYJT+jlPWTeNskjV0JTki/03WX1cyAnBhwBJfYHpV/0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
2 changes: 0 additions & 2 deletions pkg/openstack/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ func EnsureEndpointConfig(
// TLS on the pod level is enabled if
// * TLS is enabled for internal endpoint
// * the particular service has not TLS.Disabled set to true
helper.GetLogger().Info(fmt.Sprintf("BOOO %s instance.Spec.TLS.Endpoint %+v", owner.GetName(), instance.Spec.TLS.Endpoint))

if tlsEndpointConfig := instance.Spec.TLS.Endpoint[service.EndpointInternal]; tlsEndpointConfig.Enabled &&
(serviceTLSDisabled == nil || (serviceTLSDisabled != nil && !*serviceTLSDisabled)) {
ed.Service.TLS.Enabled = true
Expand Down
Loading

0 comments on commit 5141654

Please sign in to comment.