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.

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

Revert 'Add support to create internal Load Balancers on GCP.'. #367

Merged
merged 1 commit into from
Nov 2, 2022
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

## [Unreleased]

### Removed

- Revert 'Add support to create internal Load Balancers on GCP.'. ([#367](https://github.com/giantswarm/nginx-ingress-controller-app/pull/367))

### Added

- Templates: Add `controller.admissionWebhooks.patch.labels`. ([#360](https://github.com/giantswarm/nginx-ingress-controller-app/pull/360))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ metadata:
# this annotation adds lb rules for both TCP and UDP to allow UDP outbound connection with Standard LB
service.beta.kubernetes.io/azure-load-balancer-mixed-protocols: "true"
service.beta.kubernetes.io/azure-load-balancer-internal: "true"
{{- else if eq .Values.provider "gcp" }}
cloud.google.com/load-balancer-type: "Internal"
{{- end }}
{{- end }}
name: {{ include "resource.controller-service-internal.name" . }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ metadata:
{{- if not .Values.controller.service.public }}
service.beta.kubernetes.io/azure-load-balancer-internal: "true"
{{- end }}
{{- else if eq .Values.provider "gcp" }}
{{- if not .Values.controller.service.public }}
cloud.google.com/load-balancer-type: "Internal"
{{- end }}
{{- end }}
{{- end }}
name: {{ include "resource.controller-service.name" . }}
Expand Down
8 changes: 4 additions & 4 deletions helm/nginx-ingress-controller-app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,12 @@ controller:
externalTrafficPolicy: "Local"

# controller.service.public
# Applies to clusters running on AWS or Azure or GCP.
# Applies to clusters running on AWS or Azure.
# Valid values: true for public, false for internal
public: true

# controller.service.subdomain
# Applies to clusters running on AWS or Azure or GCP.
# Applies to clusters running on AWS or Azure.
# Configures external dns subdomain to be appeneded to base domain in definition of cloud load balancer's fully qualified hostname.
subdomain: "ingress"

Expand Down Expand Up @@ -347,7 +347,7 @@ controller:
externalTrafficPolicy: "Local"

# controller.service.internal.subdomain
# Applies to clusters running on AWS or Azure or GCP.
# Applies to clusters running on AWS or Azure.
# Configures external dns subdomain to be appeneded to base domain in definition of cloud load balancer's fully qualified hostname.
subdomain: "ingress-internal"

Expand Down Expand Up @@ -527,7 +527,7 @@ podSecurityPolicy:
# This value is set automatically. Do not overwrite this value.
baseDomain:

# provider (aws|kvm|azure|gcp)
# provider (aws|kvm|azure)
# The provider that the cluster is running on.
# This value is set automatically, Do not overwrite this value.
provider: aws