Browse Source

Updated Ingress API version

pull/1663/head
Sumit Ghosh 3 years ago
parent
commit
c01ac6e0b1
11 changed files with 12 additions and 13 deletions
  1. +1
    -2
      deploy/k8s/helm/apigwms/templates/ingress.yaml
  2. +1
    -1
      deploy/k8s/helm/apigwws/templates/ingress.yaml
  3. +1
    -1
      deploy/k8s/helm/identity-api/templates/ingress-dockerk8s.yaml
  4. +1
    -1
      deploy/k8s/helm/identity-api/templates/ingress.yaml
  5. +1
    -1
      deploy/k8s/helm/webhooks-api/templates/ingress.yaml
  6. +1
    -1
      deploy/k8s/helm/webhooks-web/templates/ingress.yaml
  7. +1
    -1
      deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml
  8. +1
    -1
      deploy/k8s/helm/webmvc/templates/ingress.yaml
  9. +1
    -1
      deploy/k8s/helm/webspa/templates/ingress.yaml
  10. +1
    -1
      deploy/k8s/helm/webstatus/templates/ingress.yaml
  11. +2
    -2
      deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml

+ 1
- 2
deploy/k8s/helm/apigwms/templates/ingress.yaml View File

@ -1,8 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.mobileshoppingapigw -}} {{- $serviceName := .Values.app.svc.mobileshoppingapigw -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "apigwms.fullname" . }} name: {{ template "apigwms.fullname" . }}


+ 1
- 1
deploy/k8s/helm/apigwws/templates/ingress.yaml View File

@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.webshoppingapigw -}} {{- $serviceName := .Values.app.svc.webshoppingapigw -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "apigwws.fullname" . }} name: {{ template "apigwws.fullname" . }}


+ 1
- 1
deploy/k8s/helm/identity-api/templates/ingress-dockerk8s.yaml View File

@ -3,7 +3,7 @@
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.identity }} {{- $serviceName := .Values.app.svc.identity }}
{{- $name := include "identity-api.fullname" . -}} {{- $name := include "identity-api.fullname" . -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ $name }}-local name: {{ $name }}-local


+ 1
- 1
deploy/k8s/helm/identity-api/templates/ingress.yaml View File

@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.identity }} {{- $serviceName := .Values.app.svc.identity }}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "identity-api.fullname" . }} name: {{ template "identity-api.fullname" . }}


+ 1
- 1
deploy/k8s/helm/webhooks-api/templates/ingress.yaml View File

@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.webhooks }} {{- $serviceName := .Values.app.svc.webhooks }}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "webhooks-api.fullname" . }} name: {{ template "webhooks-api.fullname" . }}


+ 1
- 1
deploy/k8s/helm/webhooks-web/templates/ingress.yaml View File

@ -1,6 +1,6 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "webhooks-web.fullname" . }} name: {{ template "webhooks-web.fullname" . }}


+ 1
- 1
deploy/k8s/helm/webmvc/templates/ingress-dockerk8s.yaml View File

@ -3,7 +3,7 @@
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.mvc }} {{- $serviceName := .Values.app.svc.mvc }}
{{- $name := include "webmvc.fullname" . -}} {{- $name := include "webmvc.fullname" . -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ $name }}-local name: {{ $name }}-local


+ 1
- 1
deploy/k8s/helm/webmvc/templates/ingress.yaml View File

@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.mvc -}} {{- $serviceName := .Values.app.svc.mvc -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "webmvc.fullname" . }} name: {{ template "webmvc.fullname" . }}


+ 1
- 1
deploy/k8s/helm/webspa/templates/ingress.yaml View File

@ -1,6 +1,6 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "webspa.fullname" . }} name: {{ template "webspa.fullname" . }}


+ 1
- 1
deploy/k8s/helm/webstatus/templates/ingress.yaml View File

@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "webstatus.fullname" . -}} {{- $fullName := include "webstatus.fullname" . -}}
{{- $ingressPath := include "pathBase" . -}} {{- $ingressPath := include "pathBase" . -}}
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ template "webstatus.fullname" . }} name: {{ template "webstatus.fullname" . }}


+ 2
- 2
deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:
@ -18,7 +18,7 @@ spec:
servicePort: http servicePort: http
path: /webmvc path: /webmvc
--- ---
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:


Loading…
Cancel
Save