Skip to content

[DRAFT] Experimental revert of #2923 — payload upgrade test #2954

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

Closed
redhat-chai-bot wants to merge 1 commit into from
Closed

[DRAFT] Experimental revert of #2923 — payload upgrade test #2954

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 0 additions & 102 deletions config/v1/tests/infrastructures.config.openshift.io/BGPBasedVIPManagement.yaml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,21 +210,6 @@ const (
DNSRecordsTypeInternal DNSRecordsType = "Internal"
)

// VIPManagementType defines which mechanism manages the API and Ingress
// VIPs on an on-premise cluster.
// +kubebuilder:validation:Enum=Keepalived;BGP
// +enum
type VIPManagementType string

const (
// VIPManagementTypeKeepalived means the VIPs are managed by the default
// keepalived/VRRP mechanism.
VIPManagementTypeKeepalived VIPManagementType = "Keepalived"
// VIPManagementTypeBGP means the VIPs are advertised via BGP by kube-vip
// (Routing Table Mode) and frr-k8s running as static pods.
VIPManagementTypeBGP VIPManagementType = "BGP"
)

// PlatformType is a specific supported infrastructure provider.
// +kubebuilder:validation:Enum="";AWS;Azure;BareMetal;GCP;Libvirt;OpenStack;None;VSphere;oVirt;IBMCloud;KubeVirt;EquinixMetal;PowerVS;AlibabaCloud;Nutanix;External
type PlatformType string
Expand Down Expand Up @@ -1089,21 +1074,6 @@ type BareMetalPlatformStatus struct {
// +optional
LoadBalancer *BareMetalPlatformLoadBalancer `json:"loadBalancer,omitempty"`

// vipManagement indicates which VIP management mechanism is active
// on this cluster.
// Allowed values are `Keepalived`, `BGP`, and omitted.
// Once set to a non-empty value, this field is immutable.
// When set to `BGP`, kube-vip (Routing Table Mode) and frr-k8s are
// deployed as static pods to advertise VIPs via BGP, replacing the
// default keepalived/VRRP mechanism.
// When set to `Keepalived`, the default keepalived-based VIP
// management is used.
// When omitted, the default keepalived-based VIP management is used.
// +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="vipManagement is immutable once set"
// +openshift:enable:FeatureGate=BGPBasedVIPManagement
// +optional
VIPManagement VIPManagementType `json:"vipManagement,omitempty"`

// dnsRecordsType determines whether records for api, api-int, and ingress
// are provided by the internal DNS service or externally.
// Allowed values are `Internal`, `External`, and omitted.
Expand Down
2 changes: 1 addition & 1 deletion config/v1/types_infrastructure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

const (
infraCRDDefaultFilePath = "0000_10_config-operator_01_infrastructures-Default.crd.yaml"
infraCRDTestPreviewFilePath = "0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml"
infraCRDTestPreviewFilePath = "0000_10_config-operator_01_infrastructures-SelfManagedHA-TechPreviewNoUpgrade.crd.yaml"
)

// TestInfrastructureStatusDefault verifies that the infrastructure CR status does not have default value
Expand Down
19 changes: 0 additions & 19 deletions ...-manifests/0000_10_config-operator_01_infrastructures-Hypershift-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,25 +1785,6 @@ spec:
datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames
to the nodes in the cluster.
type: string
vipManagement:
description: |-
vipManagement indicates which VIP management mechanism is active
on this cluster.
Allowed values are `Keepalived`, `BGP`, and omitted.
Once set to a non-empty value, this field is immutable.
When set to `BGP`, kube-vip (Routing Table Mode) and frr-k8s are
deployed as static pods to advertise VIPs via BGP, replacing the
default keepalived/VRRP mechanism.
When set to `Keepalived`, the default keepalived-based VIP
management is used.
When omitted, the default keepalived-based VIP management is used.
enum:
- Keepalived
- BGP
type: string
x-kubernetes-validations:
- message: vipManagement is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
x-kubernetes-validations:
- message: dnsRecordsType may only be set to External when loadBalancer.type
Expand Down
19 changes: 0 additions & 19 deletions ...ifests/0000_10_config-operator_01_infrastructures-Hypershift-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,25 +1770,6 @@ spec:
datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames
to the nodes in the cluster.
type: string
vipManagement:
description: |-
vipManagement indicates which VIP management mechanism is active
on this cluster.
Allowed values are `Keepalived`, `BGP`, and omitted.
Once set to a non-empty value, this field is immutable.
When set to `BGP`, kube-vip (Routing Table Mode) and frr-k8s are
deployed as static pods to advertise VIPs via BGP, replacing the
default keepalived/VRRP mechanism.
When set to `Keepalived`, the default keepalived-based VIP
management is used.
When omitted, the default keepalived-based VIP management is used.
enum:
- Keepalived
- BGP
type: string
x-kubernetes-validations:
- message: vipManagement is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
x-kubernetes-validations:
- message: dnsRecordsType may only be set to External when loadBalancer.type
Expand Down
Loading