Skip to content

Commit

Permalink
Merge pull request #715 from Deydra71/tls-support-octavia
Browse files Browse the repository at this point in the history 
[tlse] internal TLS support for octavia
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Mar 27, 2024
2 parents 2fcb054 + 9738341 commit 9af21c8
Show file tree
Hide file tree
Showing 8 changed files with 204 additions and 80 deletions.
129 changes: 93 additions & 36 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9721,6 +9721,10 @@ spec:
- name
type: object
type: array
amphoraImageContainerImage:
type: string
apacheContainerImage:
type: string
customServiceConfig:
default: '# add your customization here'
type: string
Expand Down Expand Up @@ -9887,6 +9891,24 @@ spec:
serviceUser:
default: octavia
type: string
tls:
properties:
api:
properties:
internal:
properties:
secretName:
type: string
type: object
public:
properties:
secretName:
type: string
type: object
type: object
caBundleSecretName:
type: string
type: object
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -9935,18 +9957,12 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
lbSecurityGroupID:
default: ""
type: string
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -10016,6 +10032,11 @@ spec:
tenantName:
default: service
type: string
tls:
properties:
caBundleSecretName:
type: string
type: object
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -10064,18 +10085,12 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
lbSecurityGroupID:
default: ""
type: string
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -10145,6 +10160,11 @@ spec:
tenantName:
default: service
type: string
tls:
properties:
caBundleSecretName:
type: string
type: object
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -10193,18 +10213,12 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
lbSecurityGroupID:
default: ""
type: string
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -10274,6 +10288,11 @@ spec:
tenantName:
default: service
type: string
tls:
properties:
caBundleSecretName:
type: string
type: object
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -10302,8 +10321,41 @@ spec:
rabbitMqClusterName:
default: rabbitmq
type: string
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
secret:
type: string
serviceAccount:
type: string
serviceUser:
default: octavia
type: string
Expand All @@ -10313,11 +10365,16 @@ spec:
sshPubkey:
default: octavia-ssh-pubkey
type: string
tenantName:
default: service
type: string
required:
- apacheContainerImage
- databaseInstance
- octaviaAPI
- rabbitMqClusterName
- secret
- serviceAccount
type: object
type: object
openstackclient:
Expand Down
2 changes: 1 addition & 1 deletion apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240314113200-40cf3e6aa38e
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240326115129-7fd1a4fa51c3
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240318052728-f132fab5c943
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240315154317-8b38ff1e6a8d
Expand Down
4 changes: 2 additions & 2 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240308065128-4ba88761f83f/go.mod h1:gOepjTKpq6rF0Lf69edviPOjFpjw4LHan/tWC4LB4Fs=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb h1:WwiFdrd3Qk7AsXQWMIysL8LW4XHC9gJhJ4LmbIYi4HI=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240313153742-4685453be3fb/go.mod h1:s9ZDTDlY5f7cu/ZT35kGYvLD8v6mto6MOLPcsK73e54=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d h1:Tg83hIGk29fYXPV/QICyFeAmamuD4v+2aQ87ZNi0R/k=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240314110716-d81f1e5d229d/go.mod h1:w46sjTz5g4qxAd3xkEYTakmRoZOF8TfVr5WKG0vmPSw=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240326115129-7fd1a4fa51c3 h1:eBwnx+PrS4SBQxYLlByJFX7poKigiBJsv/CGoEFGIaI=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240326115129-7fd1a4fa51c3/go.mod h1:w46sjTz5g4qxAd3xkEYTakmRoZOF8TfVr5WKG0vmPSw=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240318052728-f132fab5c943 h1:klU6Jc46yVMFAoXZgJO1gaJiw3ZjaYTNshfirR0M5oA=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240318052728-f132fab5c943/go.mod h1:dcKA0ZNATdkWVmltQQX8jYpEzM89FRIvzlo9Byj8H04=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240313145348-1dd69c7bc338 h1:4px3BVSfWmfvJf+Nurf0EJb4ViKHW4qM8ocDqH0u8C4=
Expand Down
Loading

0 comments on commit 9af21c8

Please sign in to comment.