Merge pull request #41 from boomerang-io/feat-gke+ingress

Updating ingress to use Capabilities
boomerang-io · Sep 13, 2021 · a549404 · a549404
2 parents 9db1950 + b7c2241
commit a549404
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/bmrg-flow/Chart.yaml b/bmrg-flow/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bmrg-flow
 description: Boomerang Flow
 type: application
-version: 4.10.8
+version: 4.10.9
 appVersion: 3.4.0
 home: https://useboomerang.io
 dependencies:

diff --git a/bmrg-flow/templates/ingress-app.yaml b/bmrg-flow/templates/ingress-app.yaml
@@ -5,7 +5,7 @@
 {{- $context := . -}}
 {{- if $.Values.global.ingress.enabled -}}
 {{- range $k, $v := $values.apps }}
-apiVersion: {{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
+apiVersion: {{ if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
 kind: Ingress
 metadata:
   name: {{ include "bmrg.name" (dict "context" $context "tier" $tier "component" $k ) }}

diff --git a/bmrg-flow/templates/ingress-service-api.yaml b/bmrg-flow/templates/ingress-service-api.yaml
@@ -3,7 +3,7 @@
 {{- $tier := "apis" -}}
 {{- $values := .Values -}}
 {{- $context := . -}}
-apiVersion: {{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
+apiVersion: {{ if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
 kind: Ingress
 metadata:
   name: {{ include "bmrg.name" (dict "context" $context "tier" $tier ) }}

diff --git a/bmrg-flow/templates/ingress-service-listener.yaml b/bmrg-flow/templates/ingress-service-listener.yaml
@@ -5,7 +5,7 @@
 {{- $values := .Values -}}
 {{- $context := . -}}
 {{- if and $.Values.global.ingress.enabled $values.general.enable.eventing -}}
-apiVersion: {{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
+apiVersion: {{ if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
 kind: Ingress
 metadata:
   name: {{ include "bmrg.name" (dict "context" $context "tier" $tier "component" $k ) }}

diff --git a/bmrg-flow/templates/ingress-service.yaml b/bmrg-flow/templates/ingress-service.yaml
@@ -6,7 +6,7 @@
 {{- if $.Values.global.ingress.enabled -}}
 {{- range $k, $v := $values.services }}
 {{- if and (ne $k "controller") (ne $k "listener") }}
-apiVersion: {{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
+apiVersion: {{ if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}networking.k8s.io/v1{{ else }}extensions/v1beta1{{ end }}
 kind: Ingress
 metadata:
   name: {{ include "bmrg.name" (dict "context" $context "tier" $tier "component" $k ) }}