diff --git a/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-gateway-ingress.yaml b/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-gateway-ingress.yaml index 9967e72b..606967d2 100644 --- a/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-gateway-ingress.yaml +++ b/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-gateway-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-pattern-1.resource.prefix" . }}-am-gateway-ingress @@ -30,6 +30,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-pattern-1.resource.prefix" . }}-am-service - servicePort: 8243 + service: + name: {{ template "am-pattern-1.resource.prefix" . }}-am-service + port: + number: 8243 diff --git a/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-ingress.yaml b/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-ingress.yaml index 723e2a34..f995b45a 100644 --- a/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-ingress.yaml +++ b/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-pattern-1.resource.prefix" . }}-am-ingress @@ -23,13 +23,16 @@ metadata: {{- end }} spec: tls: - - hosts: - - {{ .Values.wso2.deployment.am.ingress.management.hostname }} + - hosts: + - {{ .Values.wso2.deployment.am.ingress.management.hostname }} rules: - - host: {{ .Values.wso2.deployment.am.ingress.management.hostname }} - http: - paths: - - path: / - backend: - serviceName: {{ template "am-pattern-1.resource.prefix" . }}-am-service - servicePort: 9443 + - host: {{ .Values.wso2.deployment.am.ingress.management.hostname }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ template "am-pattern-1.resource.prefix" . }}-am-service + port: + number: 9443 diff --git a/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-websub-ingress.yaml b/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-websub-ingress.yaml index 40e6ee4e..c82c5fae 100644 --- a/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-websub-ingress.yaml +++ b/advanced/am-pattern-1/templates/am/wso2am-pattern-1-am-websub-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-pattern-1.resource.prefix" . }}-am-websub-ingress @@ -30,6 +30,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-pattern-1.resource.prefix" . }}-am-service - servicePort: 8021 + service: + name: {{ template "am-pattern-1.resource.prefix" . }}-am-service + port: + number: 8021 diff --git a/advanced/am-pattern-1/templates/mi/wso2am-pattern-1-mi-management-ingress.yaml b/advanced/am-pattern-1/templates/mi/wso2am-pattern-1-mi-management-ingress.yaml index 544fa865..efdd04f0 100644 --- a/advanced/am-pattern-1/templates/mi/wso2am-pattern-1-mi-management-ingress.yaml +++ b/advanced/am-pattern-1/templates/mi/wso2am-pattern-1-mi-management-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-pattern-1.resource.prefix" . }}-mi-1-management-ingress @@ -23,13 +23,16 @@ metadata: {{- end }} spec: tls: - - hosts: - - {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} + - hosts: + - {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} rules: - - host: {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} - http: - paths: - - path: / - backend: - serviceName: {{ template "am-pattern-1.resource.prefix" . }}-mi-1-service - servicePort: 9164 + - host: {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ template "am-pattern-1.resource.prefix" . }}-mi-1-service + port: + number: 9164 diff --git a/advanced/am-pattern-2/templates/mi/wso2am-pattern-2-mi-management-ingress.yaml b/advanced/am-pattern-2/templates/mi/wso2am-pattern-2-mi-management-ingress.yaml index 76ddefec..4e719895 100644 --- a/advanced/am-pattern-2/templates/mi/wso2am-pattern-2-mi-management-ingress.yaml +++ b/advanced/am-pattern-2/templates/mi/wso2am-pattern-2-mi-management-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-pattern-2.resource.prefix" . }}-mi-2-management-ingress @@ -23,13 +23,16 @@ metadata: {{- end }} spec: tls: - - hosts: - - {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} + - hosts: + - {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} rules: - - host: {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} - http: - paths: - - path: / - backend: - serviceName: {{ template "am-pattern-2.resource.prefix" . }}-mi-2-service - servicePort: 9164 + - host: {{ .Values.wso2.deployment.mi.ingress.management.hostname | quote }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ template "am-pattern-2.resource.prefix" . }}-mi-2-service + port: + number: 9164 diff --git a/simple/am-single/templates/am/wso2am-gateway-ingress.yaml b/simple/am-single/templates/am/wso2am-gateway-ingress.yaml index 571d0aab..27cb4bc0 100644 --- a/simple/am-single/templates/am/wso2am-gateway-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-gateway-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-single-node.resource.prefix" . }}-am-gateway-ingress @@ -30,6 +30,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-single-node.resource.prefix" . }}-am-service - servicePort: 8243 + service: + name: {{ template "am-single-node.resource.prefix" . }}-am-service + port: + number: 8243 diff --git a/simple/am-single/templates/am/wso2am-ingress.yaml b/simple/am-single/templates/am/wso2am-ingress.yaml index 31a81819..d11e5adc 100644 --- a/simple/am-single/templates/am/wso2am-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-single-node.resource.prefix" . }}-am-ingress @@ -23,13 +23,16 @@ metadata: {{- end }} spec: tls: - - hosts: - - {{ .Values.wso2.deployment.am.ingress.management.hostname }} + - hosts: + - {{ .Values.wso2.deployment.am.ingress.management.hostname }} rules: - - host: {{ .Values.wso2.deployment.am.ingress.management.hostname }} - http: - paths: - - path: / - backend: - serviceName: {{ template "am-single-node.resource.prefix" . }}-am-service - servicePort: 9443 \ No newline at end of file + - host: {{ .Values.wso2.deployment.am.ingress.management.hostname }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ template "am-single-node.resource.prefix" . }}-am-service + port: + number: 9443 diff --git a/simple/am-single/templates/am/wso2am-websub-ingress.yaml b/simple/am-single/templates/am/wso2am-websub-ingress.yaml index 9454fd09..e93cc10d 100644 --- a/simple/am-single/templates/am/wso2am-websub-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-websub-ingress.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "am-single-node.resource.prefix" . }}-am-websub-ingress @@ -30,6 +30,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-single-node.resource.prefix" . }}-am-service - servicePort: 8021 + service: + name: {{ template "am-single-node.resource.prefix" . }}-am-service + port: + number: 8021