From bbc5ddb2692f1a7f1511b2a0cf19a308c8914fc9 Mon Sep 17 00:00:00 2001 From: Isuru Maduranga Date: Tue, 26 Apr 2022 17:09:12 +0530 Subject: [PATCH 1/6] Update am-pattern-1 to latest ingress api version --- .../wso2am-pattern-1-am-gateway-ingress.yaml | 9 +++++--- .../am/wso2am-pattern-1-am-ingress.yaml | 23 +++++++++++-------- .../wso2am-pattern-1-am-websub-ingress.yaml | 9 +++++--- ...so2am-pattern-1-mi-management-ingress.yaml | 23 +++++++++++-------- 4 files changed, 38 insertions(+), 26 deletions(-) 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 From 49bb9c89ac1153b8bfe2a1bf95847c556f0b6c84 Mon Sep 17 00:00:00 2001 From: Isuru Maduranga Date: Thu, 28 Apr 2022 00:17:41 +0530 Subject: [PATCH 2/6] Update ingress version of am-pattern-2 --- ...so2am-pattern-2-mi-management-ingress.yaml | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) 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 From f0d7c80c0f3d4fcd363075b39cda88d5bbc8dd02 Mon Sep 17 00:00:00 2001 From: Isuru Maduranga Date: Thu, 28 Apr 2022 00:18:20 +0530 Subject: [PATCH 3/6] Update ingress version of simple patter --- .../templates/am/wso2am-gateway-ingress.yaml | 9 +++++--- .../templates/am/wso2am-ingress.yaml | 23 +++++++++++-------- .../templates/am/wso2am-websub-ingress.yaml | 8 ++++--- 3 files changed, 24 insertions(+), 16 deletions(-) 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..4620d8f2 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 \ No newline at end of file diff --git a/simple/am-single/templates/am/wso2am-websub-ingress.yaml b/simple/am-single/templates/am/wso2am-websub-ingress.yaml index 9454fd09..b159dc70 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 @@ -31,5 +31,7 @@ spec: paths: - path: / 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 From bb1a1615e1e2398b3cb43af2fda55417767af500 Mon Sep 17 00:00:00 2001 From: Isuru Maduranga Date: Fri, 29 Apr 2022 13:45:45 +0530 Subject: [PATCH 4/6] Add missing pathtype to gateway ingress --- simple/am-single/templates/am/wso2am-websub-ingress.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/simple/am-single/templates/am/wso2am-websub-ingress.yaml b/simple/am-single/templates/am/wso2am-websub-ingress.yaml index b159dc70..e93cc10d 100644 --- a/simple/am-single/templates/am/wso2am-websub-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-websub-ingress.yaml @@ -30,6 +30,7 @@ spec: http: paths: - path: / + pathType: Prefix backend: service: name: {{ template "am-single-node.resource.prefix" . }}-am-service From 3bf99d819df3b28222d48116156d71eb1c606858 Mon Sep 17 00:00:00 2001 From: Isuru Maduranga Date: Fri, 29 Apr 2022 14:01:07 +0530 Subject: [PATCH 5/6] Add missing new line eof --- simple/am-single/templates/am/wso2am-ingress.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/simple/am-single/templates/am/wso2am-ingress.yaml b/simple/am-single/templates/am/wso2am-ingress.yaml index 4620d8f2..afc9a7b2 100644 --- a/simple/am-single/templates/am/wso2am-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-ingress.yaml @@ -35,4 +35,5 @@ spec: service: name: {{ template "am-single-node.resource.prefix" . }}-am-service port: - number: 9443 \ No newline at end of file + number: 9443 + \ No newline at end of file From 889a987572ad0ba0cdac9d179ae8e38826da9479 Mon Sep 17 00:00:00 2001 From: Isuru Maduranga Date: Fri, 29 Apr 2022 14:03:01 +0530 Subject: [PATCH 6/6] Add missing new line eof --- simple/am-single/templates/am/wso2am-ingress.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/simple/am-single/templates/am/wso2am-ingress.yaml b/simple/am-single/templates/am/wso2am-ingress.yaml index afc9a7b2..d11e5adc 100644 --- a/simple/am-single/templates/am/wso2am-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-ingress.yaml @@ -36,4 +36,3 @@ spec: name: {{ template "am-single-node.resource.prefix" . }}-am-service port: number: 9443 - \ No newline at end of file