Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
214 changes: 112 additions & 102 deletions go.mod

Large diffs are not rendered by default.

469 changes: 242 additions & 227 deletions go.sum

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions pkg/cloud/aws/aws_config_transformer.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import (
"gopkg.in/gcfg.v1"
"gopkg.in/ini.v1"

"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
awsconfig "k8s.io/cloud-provider-aws/pkg/providers/v1/config"
"k8s.io/klog/v2"

"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
)
Expand All @@ -28,7 +30,7 @@ func CloudConfigTransformer(source string, infra *configv1.Infrastructure, netwo
return "", fmt.Errorf("failed to read the cloud.conf: %w", err)
}

setOpenShiftDefaults(cfg)
setOpenShiftDefaults(cfg, features)

return marshalAWSConfig(cfg)
}
Expand Down Expand Up @@ -89,11 +91,20 @@ func marshalAWSConfig(cfg *awsconfig.CloudConfig) (string, error) {
return buf.String(), nil
}

func setOpenShiftDefaults(cfg *awsconfig.CloudConfig) {
func setOpenShiftDefaults(cfg *awsconfig.CloudConfig, features featuregates.FeatureGate) {
if cfg.Global.ClusterServiceLoadBalancerHealthProbeMode == "" {
// OpenShift uses Shared mode by default.
// This attaches the health check for Cluster scope services to the "kube-proxy"
// health check endpoint served by OVN.
cfg.Global.ClusterServiceLoadBalancerHealthProbeMode = "Shared"
}
if features.Enabled("AWSServiceLBNetworkSecurityGroup") {
if cfg.Global.NLBSecurityGroupMode != awsconfig.NLBSecurityGroupModeManaged {
// OpenShift enforces security group by default when deploying
// service type loadbalancer NLB.
klog.Infof("Enforcing cloud provider AWS configuration NLBSecurityGroupMode to Managed")
cfg.Global.NLBSecurityGroupMode = awsconfig.NLBSecurityGroupModeManaged
}
}

}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/4meepo/tagalign/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/4meepo/tagalign/.goreleaser.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions vendor/github.com/4meepo/tagalign/options.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading