diff --git a/pkg/operator/controller/ingress/controller.go b/pkg/operator/controller/ingress/controller.go index 43984ec1a4..ef0d27400d 100644 --- a/pkg/operator/controller/ingress/controller.go +++ b/pkg/operator/controller/ingress/controller.go @@ -462,8 +462,10 @@ func setDefaultPublishingStrategy(ic *operatorv1.IngressController, platformStat } } - // Set provider parameters based on the cluster ingress config. - setDefaultProviderParameters(effectiveStrategy.LoadBalancer, ingressConfig, alreadyAdmitted) + // Set provider parameters based on the cluster ingress config if not admitted already. + if !alreadyAdmitted { + setDefaultProviderParameters(effectiveStrategy.LoadBalancer, ingressConfig) + } case operatorv1.NodePortServiceStrategyType: if effectiveStrategy.NodePort == nil { @@ -681,12 +683,12 @@ func setDefaultPublishingStrategy(ic *operatorv1.IngressController, platformStat // setDefaultProviderParameters mutates the given LoadBalancerStrategy by // defaulting its ProviderParameters field based on the defaults in the provided // ingress config object. -func setDefaultProviderParameters(lbs *operatorv1.LoadBalancerStrategy, ingressConfig *configv1.Ingress, alreadyAdmitted bool) { +func setDefaultProviderParameters(lbs *operatorv1.LoadBalancerStrategy, ingressConfig *configv1.Ingress) { var provider operatorv1.LoadBalancerProviderType if lbs.ProviderParameters != nil { provider = lbs.ProviderParameters.Type } - if len(provider) == 0 && !alreadyAdmitted { + if len(provider) == 0 { // Infer the LB type from the cluster ingress config, but only // if the ingresscontroller isn't already admitted. switch ingressConfig.Spec.LoadBalancer.Platform.Type { @@ -701,7 +703,7 @@ func setDefaultProviderParameters(lbs *operatorv1.LoadBalancerStrategy, ingressC } lbs.ProviderParameters.Type = provider defaultLBType := operatorv1.AWSClassicLoadBalancer - if p := ingressConfig.Spec.LoadBalancer.Platform; !alreadyAdmitted && p.Type == configv1.AWSPlatformType && p.AWS != nil { + if p := ingressConfig.Spec.LoadBalancer.Platform; p.Type == configv1.AWSPlatformType && p.AWS != nil { if p.AWS.Type == configv1.NLB { defaultLBType = operatorv1.AWSNetworkLoadBalancer }