Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPLAT-1554: Added featuregate for multi vCenter support. #4298

Merged
merged 1 commit into from
May 21, 2024
Merged

SPLAT-1554: Added featuregate for multi vCenter support. #4298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/google/renameio v0.1.0
github.com/imdario/mergo v0.3.13
github.com/opencontainers/go-digest v1.0.0
github.com/openshift/api v0.0.0-20240425081546-8203151f085f
github.com/openshift/api v0.0.0-20240508125607-95e22923d553
github.com/openshift/client-go v0.0.0-20240422164335-6c851f4919dd
github.com/openshift/library-go v0.0.0-20240424194921-cb8aac942b79
github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,8 @@ github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQB
github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/api v0.0.0-20240425081546-8203151f085f h1:MH6RaWREjGgf1NUcBj0iJIGXd0e6jV8jRhV4Mx/HAf4=
github.com/openshift/api v0.0.0-20240425081546-8203151f085f/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openshift/api v0.0.0-20240508125607-95e22923d553 h1:xMTwK9/Co/HyzXkNQLDcHRBgrTdL52/bgNHyDS+YY94=
github.com/openshift/api v0.0.0-20240508125607-95e22923d553/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openshift/client-go v0.0.0-20240422164335-6c851f4919dd h1:z5TPsTaB8Zzvv9fK/kVB6X+FG1GtwM56WfoanhlbyyQ=
github.com/openshift/client-go v0.0.0-20240422164335-6c851f4919dd/go.mod h1:OC07uJXbaW/s21N6XDucROlmfUOhMXD5OrY3ZN3DmiM=
github.com/openshift/kube-openapi v0.0.0-20230816122517-ffc8f001abb0 h1:GPlAy197Jkr+D0T2FNWanamraTdzS/r9ZkT29lxvHaA=
Expand Down
110 changes: 91 additions & 19 deletions install/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 90 additions & 18 deletions install/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ spec:
rule: isIP(self)
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
Expand Down Expand Up @@ -414,7 +414,7 @@ spec:
rule: isIP(self)
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
Expand All @@ -437,7 +437,9 @@ spec:
rule: isCIDR(self)
maxItems: 32
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- rule: self.all(x, self.exists_one(y, x == y))
type: object
x-kubernetes-validations:
- message: apiServerInternalIPs list is required once
Expand Down Expand Up @@ -714,7 +716,7 @@ spec:
rule: isIP(self)
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
Expand Down Expand Up @@ -743,7 +745,7 @@ spec:
rule: isIP(self)
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
Expand All @@ -766,7 +768,9 @@ spec:
rule: isCIDR(self)
maxItems: 32
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- rule: self.all(x, self.exists_one(y, x == y))
type: object
x-kubernetes-validations:
- message: apiServerInternalIPs list is required once
Expand Down Expand Up @@ -874,7 +878,7 @@ spec:
rule: isIP(self)
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
Expand Down Expand Up @@ -1041,7 +1045,7 @@ spec:
rule: isIP(self)
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
Expand All @@ -1064,7 +1068,9 @@ spec:
rule: isCIDR(self)
maxItems: 32
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- rule: self.all(x, self.exists_one(y, x == y))
nodeNetworking:
description: nodeNetworking contains the definition
of internal and external network constraints for
Expand Down Expand Up @@ -1530,7 +1536,13 @@ spec:
type: string
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
ingressIP:
description: "ingressIP is an external IP which routes
to the default ingress controller. The IP is a suitable
Expand All @@ -1550,7 +1562,13 @@ spec:
type: string
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
Expand Down Expand Up @@ -1595,7 +1613,9 @@ spec:
rule: isCIDR(self)
maxItems: 32
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- rule: self.all(x, self.exists_one(y, x == y))
nodeDNSIP:
description: nodeDNSIP is the IP address for the internal
DNS used by the nodes. Unlike the one managed by
Expand Down Expand Up @@ -1811,6 +1831,12 @@ spec:
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
ingressIP:
description: "ingressIP is an external IP which routes
to the default ingress controller. The IP is a suitable
Expand All @@ -1831,6 +1857,12 @@ spec:
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
Expand Down Expand Up @@ -1890,7 +1922,13 @@ spec:
type: string
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
cloudName:
description: cloudName is the name of the desired
OpenStack cloud in the client configuration file
Expand All @@ -1915,7 +1953,13 @@ spec:
type: string
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
Expand Down Expand Up @@ -1960,7 +2004,9 @@ spec:
rule: isCIDR(self)
maxItems: 32
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- rule: self.all(x, self.exists_one(y, x == y))
nodeDNSIP:
description: nodeDNSIP is the IP address for the internal
DNS used by the nodes. Unlike the one managed by
Expand Down Expand Up @@ -2001,6 +2047,12 @@ spec:
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
ingressIP:
description: "ingressIP is an external IP which routes
to the default ingress controller. The IP is a suitable
Expand All @@ -2021,6 +2073,12 @@ spec:
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
Expand Down Expand Up @@ -2195,7 +2253,13 @@ spec:
type: string
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: apiServerInternalIPs must contain at most
one IPv4 address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
ingressIP:
description: "ingressIP is an external IP which routes
to the default ingress controller. The IP is a suitable
Expand All @@ -2215,7 +2279,13 @@ spec:
type: string
maxItems: 2
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- message: ingressIPs must contain at most one IPv4
address and at most one IPv6 address
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
Expand Down Expand Up @@ -2260,7 +2330,9 @@ spec:
rule: isCIDR(self)
maxItems: 32
type: array
x-kubernetes-list-type: set
x-kubernetes-list-type: atomic
x-kubernetes-validations:
- rule: self.all(x, self.exists_one(y, x == y))
nodeDNSIP:
description: nodeDNSIP is the IP address for the internal
DNS used by the nodes. Unlike the one managed by
Expand Down