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

NO-JIRA: Remove OpenStack workaround for Ingress Floating IP #5176

Merged
merged 1 commit into from
Jan 23, 2025
Merged

NO-JIRA: Remove OpenStack workaround for Ingress Floating IP #5176

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
35 changes: 3 additions & 32 deletions ...rol-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
routev1 "github.com/openshift/api/route/v1"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/intstr"
)

Expand Down Expand Up @@ -89,11 +88,9 @@ func ReconcileDefaultIngressController(ingressController *operatorv1.IngressCont
Scope: loadBalancerScope,
ProviderParameters: &operatorv1.ProviderLoadBalancerParameters{
Type: operatorv1.OpenStackLoadBalancerProvider,
// TODO(emilien): add the field once bumped openshift/api and also remove `ReconcileDefaultIngressControllerWithUnstructured`.
// https://github.com/openshift/hypershift/pull/4927
// OpenStack: &operatorv1.OpenStackLoadBalancerParameters{
// FloatingIP: loadBalancerIP,
// },
OpenStack: &operatorv1.OpenStackLoadBalancerParameters{
FloatingIP: loadBalancerIP,
},
},
},
}
Expand All @@ -117,32 +114,6 @@ func ReconcileDefaultIngressController(ingressController *operatorv1.IngressCont
return nil
}

// ReconcileDefaultIngressControllerWithUnstructured reconciles the default ingress controller with an unstructured object
// that has custom fields set per platform.
func ReconcileOpenStackDefaultIngressController(ingressController *unstructured.Unstructured, ingressSubdomain string, replicas int32, isPrivate bool, loadBalancerScope operatorv1.LoadBalancerScope, loadBalancerIP string) error {
// If ingress controller already exists, skip reconciliation to allow day-2 configuration
if ingressController.GetResourceVersion() != "" {
return nil
}

unstructured.SetNestedField(ingressController.Object, ingressSubdomain, "spec", "domain")
unstructured.SetNestedField(ingressController.Object, string(operatorv1.LoadBalancerServiceStrategyType), "spec", "endpointPublishingStrategy", "type")
unstructured.SetNestedField(ingressController.Object, int64(replicas), "spec", "replicas")

unstructured.SetNestedField(ingressController.Object, string(loadBalancerScope), "spec", "endpointPublishingStrategy", "loadBalancer", "scope")
unstructured.SetNestedField(ingressController.Object, string(operatorv1.OpenStackLoadBalancerProvider), "spec", "endpointPublishingStrategy", "loadBalancer", "providerParameters", "type")
if loadBalancerIP != "" {
unstructured.SetNestedField(ingressController.Object, loadBalancerIP, "spec", "endpointPublishingStrategy", "loadBalancer", "providerParameters", "openstack", "floatingIP")
}
unstructured.SetNestedField(ingressController.Object, manifests.IngressDefaultIngressControllerCert().Name, "spec", "defaultCertificate", "name")

if isPrivate {
unstructured.SetNestedField(ingressController.Object, operatorv1.PrivateStrategyType, "spec", "endpointPublishingStrategy", "type")
unstructured.SetNestedMap(ingressController.Object, map[string]interface{}{}, "spec", "endpointPublishingStrategy", "private")
}
return nil
}

func ReconcileDefaultIngressControllerCertSecret(certSecret *corev1.Secret, sourceSecret *corev1.Secret) error {
if _, hasCertKey := sourceSecret.Data[corev1.TLSCertKey]; !hasCertKey {
return fmt.Errorf("source secret %s/%s does not have a cert key", sourceSecret.Namespace, sourceSecret.Name)
Expand Down
77 changes: 31 additions & 46 deletions ...lane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ import (

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/utils/ptr"

"github.com/google/go-cmp/cmp"
)

func TestReconcileDefaultIngressController(t *testing.T) {
Expand Down Expand Up @@ -293,6 +288,37 @@ func TestReconcileDefaultIngressController(t *testing.T) {
},
},
},
{
name: "OpenStack uses Loadbalancer publishing strategy with a floating IP",
inputIngressController: manifests.IngressDefaultIngressController(),
inputIngressDomain: fakeIngressDomain,
inputPlatformType: hyperv1.OpenStackPlatform,
inputReplicas: fakeInputReplicas,
inputIsIBMCloudUPI: false,
inputIsPrivate: false,
inputLoadBalancerIP: "1.2.3.4",
expectedIngressController: &operatorv1.IngressController{
ObjectMeta: manifests.IngressDefaultIngressController().ObjectMeta,
Spec: operatorv1.IngressControllerSpec{
Domain: fakeIngressDomain,
Replicas: &fakeInputReplicas,
EndpointPublishingStrategy: &operatorv1.EndpointPublishingStrategy{
Type: operatorv1.LoadBalancerServiceStrategyType,
LoadBalancer: &operatorv1.LoadBalancerStrategy{
ProviderParameters: &operatorv1.ProviderLoadBalancerParameters{
Type: operatorv1.OpenStackLoadBalancerProvider,
OpenStack: &operatorv1.OpenStackLoadBalancerParameters{
FloatingIP: "1.2.3.4",
},
},
},
},
DefaultCertificate: &corev1.LocalObjectReference{
Name: manifests.IngressDefaultIngressControllerCert().Name,
},
},
},
},
}
for _, tc := range testsCases {
t.Run(tc.name, func(t *testing.T) {
Expand All @@ -303,44 +329,3 @@ func TestReconcileDefaultIngressController(t *testing.T) {
})
}
}

func TestReconcileOpenStackDefaultIngressController(t *testing.T) {
ingressController := manifests.IngressDefaultIngressControllerAsUnstructured()
if err := ReconcileOpenStackDefaultIngressController(ingressController, "example.com", 1, false, operatorv1.ExternalLoadBalancer, "1.2.3.4"); err != nil {
t.Errorf("unexpected: %v", err)
}
typedIngressController := &operatorv1.IngressController{}
expected := &operatorv1.IngressController{
TypeMeta: metav1.TypeMeta{
Kind: "IngressController",
APIVersion: operatorv1.GroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Name: manifests.IngressDefaultIngressController().Name,
Namespace: manifests.IngressDefaultIngressController().Namespace,
},
Spec: operatorv1.IngressControllerSpec{
Domain: "example.com",
Replicas: ptr.To[int32](1),
EndpointPublishingStrategy: &operatorv1.EndpointPublishingStrategy{
Type: operatorv1.LoadBalancerServiceStrategyType,
LoadBalancer: &operatorv1.LoadBalancerStrategy{
Scope: operatorv1.ExternalLoadBalancer,
},
},
DefaultCertificate: &corev1.LocalObjectReference{
Name: "default-ingress-cert",
},
},
}

// Before converting, remove extra field from provider parameters, since it does not exist in type yet
unstructured.RemoveNestedField(ingressController.Object, "spec", "endpointPublishingStrategy", "loadBalancer", "providerParameters")

if err := runtime.DefaultUnstructuredConverter.FromUnstructured(ingressController.Object, typedIngressController); err != nil {
t.Errorf("unexpected: %v", err)
}
if diff := cmp.Diff(typedIngressController, expected); diff != "" {
t.Errorf("IngressController does not match expected:\n%s", diff)
}
}
11 changes: 0 additions & 11 deletions ...rol-plane-operator/hostedclusterconfigoperator/controllers/resources/manifests/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)

func IngressDefaultIngressController() *operatorv1.IngressController {
Expand All @@ -18,16 +17,6 @@ func IngressDefaultIngressController() *operatorv1.IngressController {
}
}

func IngressDefaultIngressControllerAsUnstructured() *unstructured.Unstructured {
src := IngressDefaultIngressController()
obj := &unstructured.Unstructured{}
obj.SetAPIVersion(operatorv1.GroupVersion.String())
obj.SetKind("IngressController")
obj.SetName(src.Name)
obj.SetNamespace(src.Namespace)
return obj
}

func IngressDefaultIngressControllerCert() *corev1.Secret {
return &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Expand Down
22 changes: 5 additions & 17 deletions control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,23 +1005,11 @@ func (r *reconciler) reconcileRBAC(ctx context.Context) error {
func (r *reconciler) reconcileIngressController(ctx context.Context, hcp *hyperv1.HostedControlPlane) error {
var errs []error
p := ingress.NewIngressParams(hcp)

// This is a workaround until we bump openshift/api which has the floatingIP field in the IngessControllerSpec
// TODO (cewong): Remove this when updated openshift/api is vendored
if hcp.Spec.Platform.Type == hyperv1.OpenStackPlatform {
ingressController := manifests.IngressDefaultIngressControllerAsUnstructured()
if _, err := r.CreateOrUpdate(ctx, r.client, ingressController, func() error {
return ingress.ReconcileOpenStackDefaultIngressController(ingressController, p.IngressSubdomain, p.Replicas, p.IsPrivate, p.LoadBalancerScope, p.LoadBalancerIP)
}); err != nil {
errs = append(errs, fmt.Errorf("failed to reconcile openstack default ingress controller: %w", err))
}
} else {
ingressController := manifests.IngressDefaultIngressController()
if _, err := r.CreateOrUpdate(ctx, r.client, ingressController, func() error {
return ingress.ReconcileDefaultIngressController(ingressController, p.IngressSubdomain, p.PlatformType, p.Replicas, p.IBMCloudUPI, p.IsPrivate, p.AWSNLB, p.LoadBalancerScope, p.LoadBalancerIP)
}); err != nil {
errs = append(errs, fmt.Errorf("failed to reconcile default ingress controller: %w", err))
}
ingressController := manifests.IngressDefaultIngressController()
if _, err := r.CreateOrUpdate(ctx, r.client, ingressController, func() error {
return ingress.ReconcileDefaultIngressController(ingressController, p.IngressSubdomain, p.PlatformType, p.Replicas, p.IBMCloudUPI, p.IsPrivate, p.AWSNLB, p.LoadBalancerScope, p.LoadBalancerIP)
}); err != nil {
errs = append(errs, fmt.Errorf("failed to reconcile default ingress controller: %w", err))
}

sourceCert := cpomanifests.IngressCert(hcp.Namespace)
Expand Down