Skip to content

[AWS] Add LB Type in the infrastructure cluster object via install-config yaml #6074

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
miheer wants to merge 3 commits into from
Closed

[AWS] Add LB Type in the infrastructure cluster object via install-config yaml #6074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbd2ea0
aws: Add API field for ingress config's AWS LBType in the installer.
miheer Jul 4, 2022
3f23e9e
aws: vendor related changes after overriding openshift-api
miheer Sep 16, 2022
b81fae1
aws: Override openshift/api to commit 18c29829579007b64a71c0ed0d4dfd6…
miheer Sep 16, 2022
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
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions data/data/install.openshift.io_installconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ spec:
- Console
- Insights
- Storage
- CSISnapshot
type: string
type: array
baselineCapabilitySet:
Expand Down Expand Up @@ -1711,6 +1712,19 @@ spec:
the subnets. Leave the hosted zone unset to have the installer
create the hosted zone on your behalf.
type: string
lbType:
description: 'LBType allows user to set a load balancer type.
When this field is set the default ingresscontroller will get
created using the specified LBType. If this field is not set
then the default ingress controller of LBType Classic will be
created. Valid values are: * "Classic": A Classic Load Balancer
that makes routing decisions at either the transport layer
(TCP/SSL) or the application layer (HTTP/HTTPS). See the following
for additional details: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#clb
* "NLB": A Network Load Balancer that makes routing decisions
at the transport layer (TCP/SSL). See the following for additional
details: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#nlb'
type: string
propagateUserTags:
description: PropagateUserTags is a flag that directs in-cluster
operators to include the specified user tags in the tags of
Expand Down
33 changes: 18 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/openshift/installer
go 1.18

require (
cloud.google.com/go v0.81.0
cloud.google.com/go/monitoring v1.6.0
github.com/AlecAivazis/survey/v2 v2.3.5
github.com/Azure/azure-sdk-for-go v51.2.0+incompatible
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0
github.com/Azure/go-autorest/autorest v0.11.18
github.com/Azure/go-autorest/autorest v0.11.27
github.com/Azure/go-autorest/autorest/azure/auth v0.5.1
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/IBM-Cloud/bluemix-go v0.0.0-20211102075456-ffc4e11dfb16
Expand Down Expand Up @@ -73,18 +73,18 @@ require (
github.com/ulikunitz/xz v0.5.10
github.com/vincent-petithory/dataurl v1.0.0
github.com/vmware/govmomi v0.27.4
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab
google.golang.org/api v0.44.0
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368
google.golang.org/grpc v1.46.0
google.golang.org/api v0.91.0
google.golang.org/genproto v0.0.0-20220808131553-a91ffa7f803e
google.golang.org/grpc v1.48.0
gopkg.in/ini.v1 v1.66.4
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.24.3
k8s.io/api v0.25.0
k8s.io/apiextensions-apiserver v0.24.3
k8s.io/apimachinery v0.24.3
k8s.io/apimachinery v0.25.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/cloud-provider-vsphere v0.0.0
k8s.io/klog v1.0.0
Expand Down Expand Up @@ -113,17 +113,18 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.24.3 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
sigs.k8s.io/controller-runtime v0.11.0 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

require (
cloud.google.com/go/compute v1.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
Expand All @@ -145,7 +146,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.0 // indirect
github.com/diskfs/go-diskfs v1.2.1-0.20210727185522-a769efacd235 // indirect
github.com/emicklei/go-restful v2.14.2+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
Expand All @@ -165,10 +166,12 @@ require (
github.com/go-stack/stack v1.8.1 // indirect
github.com/gobuffalo/flect v0.2.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.2.0 // indirect
Expand Down Expand Up @@ -236,13 +239,13 @@ replace github.com/openshift/machine-config-operator => github.com/openshift/mac

// Needed because machine-api-operator uses a "later" v12 version, which is actually an earlier version.
// This should be kept in line with the k8s version used.
replace k8s.io/client-go => k8s.io/client-go v0.24.0
replace k8s.io/client-go => k8s.io/client-go v0.25.0

// Needed so that the InstallConfig CRD can be created. Later versions of controller-gen balk at using IPNet as a field.
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185

// Override the OpenShift API version in hive
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20220823143838-5768cc618ba0
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20220929023536-18c298295790

replace github.com/terraform-providers/terraform-provider-nutanix => github.com/nutanix/terraform-provider-nutanix v1.5.0

Expand Down
Loading