From f6222ee2efc83e4b02c63d2e8736bc7927f07c91 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Wed, 30 Mar 2022 15:03:53 +0530 Subject: [PATCH 01/15] Update ingress api version --- .../am/wso2am-pattern-1-am-gateway-ingress.yaml | 10 +++++++--- .../templates/am/wso2am-pattern-1-am-ingress.yaml | 10 +++++++--- .../am/wso2am-pattern-1-am-websub-ingress.yaml | 10 +++++++--- .../mi/wso2am-pattern-2-mi-management-ingress.yaml | 9 ++++++--- .../am-single/templates/am/wso2am-gateway-ingress.yaml | 9 ++++++--- simple/am-single/templates/am/wso2am-ingress.yaml | 9 ++++++--- .../am-single/templates/am/wso2am-websub-ingress.yaml | 9 ++++++--- 7 files changed, 45 insertions(+), 21 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..3db8e226 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,10 @@ 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..c7918f57 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 @@ -30,6 +30,10 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-pattern-1.resource.prefix" . }}-am-service - servicePort: 9443 + 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..65c3c0a0 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,10 @@ 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-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..a35f5dae 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 @@ -30,6 +30,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-pattern-2.resource.prefix" . }}-mi-2-service - servicePort: 9164 + 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..8cc9adee 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..27ab0f12 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 @@ -30,6 +30,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-single-node.resource.prefix" . }}-am-service - servicePort: 9443 \ No newline at end of file + 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..9d842601 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 From da2f01a33e303b991b6babaeed5a38ffa217e195 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Wed, 30 Mar 2022 15:43:43 +0530 Subject: [PATCH 02/15] Add APIM configuration parameters to enable/disable APIM ingresses --- advanced/am-pattern-1/README.md | 3 +++ .../templates/am/wso2am-pattern-1-am-gateway-ingress.yaml | 4 +++- .../templates/am/wso2am-pattern-1-am-ingress.yaml | 4 +++- .../templates/am/wso2am-pattern-1-am-websub-ingress.yaml | 4 +++- advanced/am-pattern-1/values.yaml | 3 +++ advanced/am-pattern-2/README.md | 3 +++ advanced/am-pattern-2/values.yaml | 3 +++ advanced/am-pattern-3/README.md | 3 +++ .../wso2am-pattern-3-am-control-plane-ingress.yaml | 3 +++ .../am/gateway/wso2am-pattern-3-am-gateway-ingress.yaml | 3 +++ .../am/gateway/wso2am-pattern-3-am-websub-ingress.yaml | 3 +++ advanced/am-pattern-3/values.yaml | 3 +++ advanced/am-pattern-4/README.md | 3 +++ .../wso2am-pattern-4-am-control-plane-ingress.yaml | 3 +++ .../am/gateway/wso2am-pattern-4-am-gateway-ingress.yaml | 3 +++ .../am/gateway/wso2am-pattern-4-am-websub-ingress.yaml | 3 +++ advanced/am-pattern-4/values.yaml | 3 +++ simple/am-single/README.md | 3 +++ simple/am-single/templates/am/wso2am-gateway-ingress.yaml | 3 +++ simple/am-single/templates/am/wso2am-ingress.yaml | 3 +++ simple/am-single/templates/am/wso2am-websub-ingress.yaml | 3 +++ simple/am-single/values.yaml | 3 +++ 22 files changed, 66 insertions(+), 3 deletions(-) diff --git a/advanced/am-pattern-1/README.md b/advanced/am-pattern-1/README.md index 5c002f9b..32d4cd0e 100644 --- a/advanced/am-pattern-1/README.md +++ b/advanced/am-pattern-1/README.md @@ -261,10 +261,13 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.resources.limits.memory` | The maximum amount of memory that should be allocated for a Pod | 3Gi | | `wso2.deployment.am.resources.limits.cpu` | The maximum amount of CPU that should be allocated for a Pod | 3000m | | `wso2.deployment.am.config` | Custom deployment configuration file (`/repository/conf/deployment.toml`) | - | +| `wso2.deployment.am.ingress.management.enabled` | If enabled, create ingress resource for API Manager management consoles | true | | `wso2.deployment.am.ingress.management.hostname` | Hostname for API Manager Admin Portal, Publisher, DevPortal and Carbon Management Console | `am.wso2.com` | | `wso2.deployment.am.ingress.management.annotations` | Ingress resource annotations for API Manager management consoles | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.ingress.gateway.enabled` | If enabled, create ingress resource for API Manager Gateway | true | | `wso2.deployment.am.ingress.gateway.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `wso2.deployment.am.ingress.gateway.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.ingress.websub.enabled` | If enabled, create ingress resource for WebSub service | true | | `wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Websub services | `websub.am.wso2.com` | | `wso2.deployment.am.ingress.websub.annotations` | Ingress resource annotations for API Manager Websub | Community NGINX Ingress controller annotations | 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 3db8e226..b169bd27 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,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.ingress.gateway.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -36,4 +38,4 @@ spec: name: {{ template "am-pattern-1.resource.prefix" . }}-am-service port: number: 8243 - +{{- end -}} 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 c7918f57..3e39880f 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,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.ingress.management.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -36,4 +38,4 @@ spec: name: {{ template "am-pattern-1.resource.prefix" . }}-am-service port: number: 9443 - +{{- end -}} 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 65c3c0a0..16c54a0a 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,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.ingress.websub.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -36,4 +38,4 @@ spec: name: {{ template "am-pattern-1.resource.prefix" . }}-am-service port: number: 8021 - +{{- end -}} diff --git a/advanced/am-pattern-1/values.yaml b/advanced/am-pattern-1/values.yaml index cd6608cc..976eb1fd 100644 --- a/advanced/am-pattern-1/values.yaml +++ b/advanced/am-pattern-1/values.yaml @@ -106,6 +106,7 @@ wso2: # Configure Ingresses ingress: management: + enabled: true # Hostname for API Manager Carbon Management Console, Publisher, DevPortal and Admin Portal hostname: "am.wso2.com" # Annotations for the API Manager Publisher-DevPortal services Ingress @@ -116,6 +117,7 @@ wso2: nginx.ingress.kubernetes.io/session-cookie-name: "route" nginx.ingress.kubernetes.io/session-cookie-hash: "sha1" gateway: + enabled: true # Hostname for Gateway profile hostname: "gateway.am.wso2.com" # Annotations for the API Manager Gateway service Ingress @@ -123,6 +125,7 @@ wso2: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" websub: + enabled: true hostname: "websub.am.wso2.com" # Annotations for the API Manager WebSub service Ingress annotations: diff --git a/advanced/am-pattern-2/README.md b/advanced/am-pattern-2/README.md index 91318c4c..e917db43 100644 --- a/advanced/am-pattern-2/README.md +++ b/advanced/am-pattern-2/README.md @@ -293,10 +293,13 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `am-pattern-1.wso2.deployment.am.resources.limits.memory` | The maximum amount of memory that should be allocated for a Pod | 3Gi | | `am-pattern-1.wso2.deployment.am.resources.limits.cpu` | The maximum amount of CPU that should be allocated for a Pod | 3000m | | `am-pattern-1.wso2.deployment.am.config` | Custom deployment configuration file (`/repository/conf/deployment.toml`) | - | +| `am-pattern-1.wso2.deployment.am.ingress.management.enabled` | If enabled, create ingress resource for API Manager management consoles | true | | `am-pattern-1.wso2.deployment.am.ingress.management.hostname` | Hostname for API Manager Admin Portal, Publisher, DevPortal and Carbon Management Console | `am.wso2.com` | | `am-pattern-1.wso2.deployment.am.ingress.management.annotations` | Ingress resource annotations for API Manager management consoles | Community NGINX Ingress controller annotations | +| `am-pattern-1.wso2.deployment.am.ingress.gateway.enabled` | If enabled, create ingress resource for API Manager Gateway | true | | `am-pattern-1.wso2.deployment.am.ingress.gateway.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `am-pattern-1.wso2.deployment.am.ingress.gateway.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | +| `am-pattern-1.wso2.deployment.am.ingress.websub.enabled` | If enabled, create ingress resource for WebSub service | true | | `am-pattern-1.wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Websub services | `websub.am.wso2.com` | | `am-pattern-1.wso2.deployment.am.ingress.websub.annotations` | Ingress resource annotations for API Manager Websub | Community NGINX Ingress controller annotations | diff --git a/advanced/am-pattern-2/values.yaml b/advanced/am-pattern-2/values.yaml index e13edd4a..318c7f44 100644 --- a/advanced/am-pattern-2/values.yaml +++ b/advanced/am-pattern-2/values.yaml @@ -175,6 +175,7 @@ am-pattern-1: # Configure Ingresses ingress: management: + enabled: true # Hostname for API Manager Carbon Management Console, Publisher, DevPortal and Admin Portal hostname: "am.wso2.com" # Annotations for the API Manager Publisher-DevPortal services Ingress @@ -185,6 +186,7 @@ am-pattern-1: nginx.ingress.kubernetes.io/session-cookie-name: "route" nginx.ingress.kubernetes.io/session-cookie-hash: "sha1" gateway: + enabled: true # Hostname for Gateway profile hostname: "gateway.am.wso2.com" # Annotations for the API Manager Gateway service Ingress @@ -192,6 +194,7 @@ am-pattern-1: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" websub: + enabled: true hostname: "websub.am.wso2.com" # Annotations for the API Manager WebSub service Ingress annotations: diff --git a/advanced/am-pattern-3/README.md b/advanced/am-pattern-3/README.md index 87b0a038..7b5f41b9 100644 --- a/advanced/am-pattern-3/README.md +++ b/advanced/am-pattern-3/README.md @@ -257,8 +257,10 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager optimized profile | 10 | | `wso2.deployment.am.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for API Manager optimized profile | 60 | | `wso2.deployment.am.readinessProbe.periodSeconds` | Period of the readiness probe for API Manager optimized profile | 10 | +| `wso2.deployment.am.websub.ingress.enabled` | If enabled, create ingress resource for WebSub service | true | | `wso2.deployment.am.websub.ingress.hostname` | Hostname for API Manager WebSub service | `websub.am.wso2.com` | | `wso2.deployment.am.websub.ingress.annotations` | Ingress resource annotations for API Manager WebSub | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.gateway.ingress.enabled` | If enabled, create ingress resource for API Manager Gateway | true | | `wso2.deployment.am.gateway.ingress.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `wso2.deployment.am.gateway.ingress.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | | `wso2.deployment.am.gateway.replicas` | Number of replicas of API Manager Gateway to be started | 2 | @@ -269,6 +271,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.cp.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager Control Plane profile | 10 | | `wso2.deployment.am.cp.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for API Manager Control Plane profile | 60 | | `wso2.deployment.am.cp.readinessProbe.periodSeconds` | Period of the readiness probe for API Manager Control Plane profile | 10 | +| `wso2.deployment.am.cp.ingress.enabled` | If enabled, create ingress resource for API Manager management consoles | true | | `wso2.deployment.am.cp.ingress.hostname` | Hostname for API Manager Control Plane | `am.wso2.com` | | `wso2.deployment.am.cp.ingress.annotations` | Ingress resource annotations for API Manager Control Plane | Community NGINX Ingress controller annotations | | `wso2.deployment.am.cp.resources.requests.memory` | The minimum amount of memory that should be allocated for running API Manager API Manager Control Plane | 1Gi | diff --git a/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-ingress.yaml b/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-ingress.yaml index 956c9388..7cae6ae8 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-ingress.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.cp.ingress.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,3 +41,4 @@ spec: name: {{ template "am-pattern-3.resource.prefix" . }}-am-cp-service port: number: 9443 +{{- end -}} diff --git a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-ingress.yaml b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-ingress.yaml index 84860a02..e992482d 100644 --- a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-ingress.yaml +++ b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.gateway.ingress.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,3 +41,4 @@ spec: name: {{ template "am-pattern-3.resource.prefix" . }}-am-gateway-service port: number: 8243 +{{- end -}} diff --git a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-websub-ingress.yaml b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-websub-ingress.yaml index dcdb6994..d8526cae 100644 --- a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-websub-ingress.yaml +++ b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-websub-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.websub.ingress.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,3 +41,4 @@ spec: name: {{ template "am-pattern-3.resource.prefix" . }}-am-gateway-service port: number: 8021 +{{- end -}} diff --git a/advanced/am-pattern-3/values.yaml b/advanced/am-pattern-3/values.yaml index 360329c2..17a766a9 100644 --- a/advanced/am-pattern-3/values.yaml +++ b/advanced/am-pattern-3/values.yaml @@ -108,6 +108,7 @@ wso2: websub: # Configure Ingress ingress: + enabled: true # Name of the IngressClass to use className: "" # Hostname for Gateway (WebSub) service @@ -121,6 +122,7 @@ wso2: gateway: # Configure Ingress ingress: + enabled: true # Name of the IngressClass to use className: "" # Hostname for Gateway profile @@ -171,6 +173,7 @@ wso2: # Configure Ingress ingress: + enabled: true # Name of the IngressClass to use className: "" # Hostname for Control Plane profile diff --git a/advanced/am-pattern-4/README.md b/advanced/am-pattern-4/README.md index a43f7f9f..7853c055 100644 --- a/advanced/am-pattern-4/README.md +++ b/advanced/am-pattern-4/README.md @@ -257,8 +257,10 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager optimized profile | 10 | | `wso2.deployment.am.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for API Manager optimized profile | 60 | | `wso2.deployment.am.readinessProbe.periodSeconds` | Period of the readiness probe for API Manager optimized profile | 10 | +| `wso2.deployment.am.websub.ingress.enabled` | If enabled, create ingress resource for WebSub service | true | | `wso2.deployment.am.websub.ingress.hostname` | Hostname for API Manager WebSub service | `websub.am.wso2.com` | | `wso2.deployment.am.websub.ingress.annotations` | Ingress resource annotations for API Manager WebSub | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.gateway.ingress.enabled` | If enabled, create ingress resource for API Manager Gateway | true | | `wso2.deployment.am.gateway.ingress.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `wso2.deployment.am.gateway.ingress.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | | `wso2.deployment.am.gateway.replicas` | Number of replicas of API Manager Gateway to be started | 2 | @@ -269,6 +271,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.cp.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager Control Plane profile | 10 | | `wso2.deployment.am.cp.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for API Manager Control Plane profile | 60 | | `wso2.deployment.am.cp.readinessProbe.periodSeconds` | Period of the readiness probe for API Manager Control Plane profile | 10 | +| `wso2.deployment.am.cp.ingress.enabled` | If enabled, create ingress resource for API Manager management consoles | true | | `wso2.deployment.am.cp.ingress.hostname` | Hostname for API Manager Control Plane | `am.wso2.com` | | `wso2.deployment.am.cp.ingress.annotations` | Ingress resource annotations for API Manager Control Plane | Community NGINX Ingress controller annotations | | `wso2.deployment.am.cp.resources.requests.memory` | The minimum amount of memory that should be allocated for running API Manager API Manager Control Plane | 1Gi | diff --git a/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-ingress.yaml b/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-ingress.yaml index 89b5a7e4..7439b9f8 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-ingress.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.cp.ingress.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,3 +41,4 @@ spec: name: {{ template "am-pattern-4.resource.prefix" . }}-am-cp-service port: number: 9443 +{{- end -}} diff --git a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-ingress.yaml b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-ingress.yaml index b443b149..13592562 100644 --- a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-ingress.yaml +++ b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.gateway.ingress.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,3 +41,4 @@ spec: name: {{ template "am-pattern-4.resource.prefix" . }}-am-gateway-service port: number: 8243 +{{- end -}} diff --git a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-websub-ingress.yaml b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-websub-ingress.yaml index f6c3c11e..ac7193b2 100644 --- a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-websub-ingress.yaml +++ b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-websub-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.websub.ingress.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,3 +41,4 @@ spec: name: {{ template "am-pattern-4.resource.prefix" . }}-am-gateway-service port: number: 8021 +{{- end -}} diff --git a/advanced/am-pattern-4/values.yaml b/advanced/am-pattern-4/values.yaml index 0270c332..4ef5d7c1 100644 --- a/advanced/am-pattern-4/values.yaml +++ b/advanced/am-pattern-4/values.yaml @@ -108,6 +108,7 @@ wso2: websub: # Configure Ingress ingress: + enabled: true # Name of the IngressClass to use className: "" # Hostname for Gateway (WebSub) service @@ -121,6 +122,7 @@ wso2: gateway: # Configure Ingress ingress: + enabled: true # Name of the IngressClass to use className: "" # Hostname for Gateway profile @@ -208,6 +210,7 @@ wso2: # Configure Ingress ingress: + enabled: true # Name of the IngressClass to use className: "" # Hostname for Control Plane profile diff --git a/simple/am-single/README.md b/simple/am-single/README.md index 31c9cde5..89fd00f2 100644 --- a/simple/am-single/README.md +++ b/simple/am-single/README.md @@ -236,10 +236,13 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.resources.limits.memory` | The maximum amount of memory that should be allocated for a Pod | 3Gi | | `wso2.deployment.am.resources.limits.cpu` | The maximum amount of CPU that should be allocated for a Pod | 3000m | | `wso2.deployment.am.config` | Custom deployment configuration file (`/repository/conf/deployment.toml`) | - | +| `wso2.deployment.am.ingress.management.enabled` | If enabled, create ingress resource for API Manager management consoles | true | | `wso2.deployment.am.ingress.management.hostname` | Hostname for API Manager Admin Portal, Publisher, DevPortal and Carbon Management Console | `am.wso2.com` | | `wso2.deployment.am.ingress.management.annotations` | Ingress resource annotations for API Manager management consoles | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.ingress.gateway.enabled` | If enabled, create ingress resource for API Manager Gateway | true | | `wso2.deployment.am.ingress.gateway.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `wso2.deployment.am.ingress.gateway.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.ingress.websub.enabled` | If enabled, create ingress resource for WebSub service | true | | `wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Gateway WebSub service | `gateway.am.wso2.com` | | `wso2.deployment.am.ingress.websub.annotations` | Ingress resource annotations for API Manager Gateway WebSub | Community NGINX Ingress controller annotations | diff --git a/simple/am-single/templates/am/wso2am-gateway-ingress.yaml b/simple/am-single/templates/am/wso2am-gateway-ingress.yaml index 8cc9adee..cc9eefea 100644 --- a/simple/am-single/templates/am/wso2am-gateway-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-gateway-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.ingress.gateway.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -36,3 +38,4 @@ spec: name: {{ template "am-single-node.resource.prefix" . }}-am-service port: number: 8243 +{{- end -}} diff --git a/simple/am-single/templates/am/wso2am-ingress.yaml b/simple/am-single/templates/am/wso2am-ingress.yaml index 27ab0f12..afd562ce 100644 --- a/simple/am-single/templates/am/wso2am-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.ingress.management.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -36,3 +38,4 @@ spec: name: {{ template "am-single-node.resource.prefix" . }}-am-service port: number: 9443 +{{- end -}} diff --git a/simple/am-single/templates/am/wso2am-websub-ingress.yaml b/simple/am-single/templates/am/wso2am-websub-ingress.yaml index 9d842601..4ff846d9 100644 --- a/simple/am-single/templates/am/wso2am-websub-ingress.yaml +++ b/simple/am-single/templates/am/wso2am-websub-ingress.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- if .Values.wso2.deployment.am.ingress.websub.enabled }} + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -36,3 +38,4 @@ spec: name: {{ template "am-single-node.resource.prefix" . }}-am-service port: number: 8021 +{{- end -}} diff --git a/simple/am-single/values.yaml b/simple/am-single/values.yaml index eca5cc3f..23632b37 100644 --- a/simple/am-single/values.yaml +++ b/simple/am-single/values.yaml @@ -106,6 +106,7 @@ wso2: # Configure Ingresses ingress: management: + enabled: true # Hostname for API Manager Carbon Management Console, Publisher, DevPortal and Admin Portal hostname: "am.wso2.com" # Annotations for the API Manager Publisher-DevPortal services Ingress @@ -116,6 +117,7 @@ wso2: nginx.ingress.kubernetes.io/session-cookie-name: "route" nginx.ingress.kubernetes.io/session-cookie-hash: "sha1" gateway: + enabled: true # Hostname for Gateway profile hostname: "gateway.am.wso2.com" # Annotations for the API Manager Gateway service Ingress @@ -123,6 +125,7 @@ wso2: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" websub: + enabled: true hostname: "websub.am.wso2.com" # Annotations for the API Manager Gateway service Ingress annotations: From 8fa1eb5ffee4554ec3bbfdfbc217a5fd9d677426 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Wed, 30 Mar 2022 16:38:01 +0530 Subject: [PATCH 03/15] Fix indentations in configmaps' 'config' configuration parameter --- .../instance-1/wso2am-pattern-1-am-conf.yaml | 6 +++--- .../instance-2/wso2am-pattern-1-am-conf.yaml | 6 +++--- advanced/am-pattern-2/values.yaml | 6 +++--- ...so2am-pattern-3-am-control-plane-conf.yaml | 4 +++- ...so2am-pattern-3-am-control-plane-conf.yaml | 4 +++- .../wso2am-pattern-3-am-gateway-conf.yaml | 2 +- advanced/am-pattern-3/values.yaml | 12 ++++++------ ...so2am-pattern-4-am-control-plane-conf.yaml | 2 +- ...so2am-pattern-4-am-control-plane-conf.yaml | 2 +- .../wso2am-pattern-4-am-gateway-conf.yaml | 2 +- ...o2am-pattern-4-am-trafficmanager-conf.yaml | 2 +- ...o2am-pattern-4-am-trafficmanager-conf.yaml | 2 +- advanced/am-pattern-4/values.yaml | 19 +++++++++++++------ .../instance/wso2am-single-node-am-conf.yaml | 2 +- simple/am-single/values.yaml | 6 +++--- 15 files changed, 44 insertions(+), 33 deletions(-) diff --git a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml index 34e53dd5..830281da 100644 --- a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml +++ b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml @@ -20,9 +20,9 @@ metadata: {{ if .Values.wso2.deployment.am.config }} data: {{- range $index, $content := .Values.wso2.deployment.am.config }} - {{ $index }}: |- - {{ tpl $content $ | indent 4 }} - {{- end }} + {{ $index }}: |- +{{ tpl $content $ | indent 4 }} + {{- end }} {{ else }} data: diff --git a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml index 6f297367..411ae127 100644 --- a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml +++ b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml @@ -20,9 +20,9 @@ metadata: {{ if .Values.wso2.deployment.am.config }} data: {{- range $index, $content := .Values.wso2.deployment.am.config }} - {{ $index }}: |- - {{ tpl $content $ | indent 4 }} - {{- end }} + {{ $index }}: |- +{{ tpl $content $ | indent 4 }} + {{- end }} {{ else }} data: diff --git a/advanced/am-pattern-2/values.yaml b/advanced/am-pattern-2/values.yaml index 318c7f44..75efdab6 100644 --- a/advanced/am-pattern-2/values.yaml +++ b/advanced/am-pattern-2/values.yaml @@ -168,9 +168,9 @@ am-pattern-1: # If the deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml), # add the customized configuration file under (wso2 -> deployment -> am -> config -> deployment.toml) - # config: "" - # deployment.toml: |- - # # deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) + # config: "" + # deployment.toml: |- + # # deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) # Configure Ingresses ingress: diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml index 6609c04b..3579db65 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml @@ -21,10 +21,12 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.cp.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} + + {{ else }} data: deployment.toml: |- [server] diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml index d4d56ad3..23085411 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml @@ -21,10 +21,12 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.cp.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} + + {{ else }} data: deployment.toml: |- [server] diff --git a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-conf.yaml b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-conf.yaml index c91ebad6..4371225f 100644 --- a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-conf.yaml +++ b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-conf.yaml @@ -21,7 +21,7 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.gateway.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} diff --git a/advanced/am-pattern-3/values.yaml b/advanced/am-pattern-3/values.yaml index 17a766a9..0c506713 100644 --- a/advanced/am-pattern-3/values.yaml +++ b/advanced/am-pattern-3/values.yaml @@ -145,9 +145,9 @@ wso2: # If the deployment configurations for the Gateway profile of WSO2 API Manager v3.2.0 (/repository/conf/deployment.toml), # add the customized configuration file under (wso2 -> deployment -> am -> gateway -> config -> deployment.toml) -# config: -# deployment.toml: |- -# # deployment configurations for the Gateway profile of WSO2 API Manager v3.2.0 (/repository/conf/deployment.toml) + # config: + # deployment.toml: |- + # # deployment configurations for the Gateway profile of WSO2 API Manager v3.2.0 (/repository/conf/deployment.toml) # API Manager's Control Plane specific configurations cp: @@ -209,9 +209,9 @@ wso2: # Maximum Heap size xmx: "1024m" -# config: -# deployment.toml: |- -# # deployment configurations for the Control Plane profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) + # config: + # deployment.toml: |- + # # deployment configurations for the Control Plane profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) mi: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value. diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml index d93453e7..7696c92a 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml @@ -21,7 +21,7 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.cp.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml index 59f97fab..f832a218 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml @@ -21,7 +21,7 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.cp.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} diff --git a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-conf.yaml b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-conf.yaml index a1250844..3d0692f5 100644 --- a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-conf.yaml +++ b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-conf.yaml @@ -21,7 +21,7 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.gateway.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml index f5389145..4e0b63ed 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml @@ -21,7 +21,7 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.trafficmanager.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml index bf66c87a..d7ac0cc8 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml @@ -21,7 +21,7 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.trafficmanager.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} diff --git a/advanced/am-pattern-4/values.yaml b/advanced/am-pattern-4/values.yaml index 4ef5d7c1..a5709536 100644 --- a/advanced/am-pattern-4/values.yaml +++ b/advanced/am-pattern-4/values.yaml @@ -143,6 +143,13 @@ wso2: # The maximum number of pods that can be unavailable during the update maxUnavailable: 0 + # If the deployment configurations for the Gateway profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml), + # add the customized configuration file under (wso2 -> deployment -> am -> gateway -> config -> deployment.toml) + # config: + # deployment.toml: |- + # # deployment configurations for the Gateway profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) + + # API Manager's Traffic Manager specific configurations trafficmanager: # Indicates whether the container is running @@ -182,9 +189,9 @@ wso2: # If the deployment configurations for the Gateway profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml), # add the customized configuration file under (wso2 -> deployment -> am -> gateway -> config -> deployment.toml) -# config: -# deployment.toml: |- -# # deployment configurations for the Gateway profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) + # config: + # deployment.toml: |- + # # deployment configurations for the Gateway profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) # API Manager's Control Plane specific configurations cp: @@ -246,9 +253,9 @@ wso2: # Maximum Heap size xmx: "1024m" -# config: -# deployment.toml: |- -# # deployment configurations for the Control Plane profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) + # config: + # deployment.toml: |- + # # deployment configurations for the Control Plane profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) mi: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value. diff --git a/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml b/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml index 50dedcda..f7ad96ca 100644 --- a/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml +++ b/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml @@ -21,7 +21,7 @@ metadata: data: {{- range $index, $content := .Values.wso2.deployment.am.config }} {{ $index }}: |- - {{ tpl $content $ | indent 4 }} +{{ tpl $content $ | indent 4 }} {{- end }} {{ else }} diff --git a/simple/am-single/values.yaml b/simple/am-single/values.yaml index 23632b37..6f38ac6a 100644 --- a/simple/am-single/values.yaml +++ b/simple/am-single/values.yaml @@ -99,9 +99,9 @@ wso2: # If the deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml), # add the customized configuration file under (wso2 -> deployment -> am -> config -> deployment.toml) -# config: "" -# deployment.toml: |- -# # deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) + # config: + # deployment.toml: |- + # # deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) # Configure Ingresses ingress: From 4a81c1987107e2c9b354394c46a2a5c530cc0afa Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 08:36:37 +0530 Subject: [PATCH 04/15] Update mysql-am Helm chart for 4.1.0 release --- advanced/mysql-am/Chart.yaml | 2 +- advanced/mysql-am/values.yaml | 161 +++++++++++++++++++++++++++------- 2 files changed, 131 insertions(+), 32 deletions(-) diff --git a/advanced/mysql-am/Chart.yaml b/advanced/mysql-am/Chart.yaml index 8466506b..2b15a101 100644 --- a/advanced/mysql-am/Chart.yaml +++ b/advanced/mysql-am/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "5.7" description: A Helm chart for MySQL based deployment of WSO2 API Management Datasources name: mysql-am -version: 4.0.0-2 +version: 4.1.0-1 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/mysql-am/values.yaml b/advanced/mysql-am/values.yaml index afb0f4aa..f3d7a022 100644 --- a/advanced/mysql-am/values.yaml +++ b/advanced/mysql-am/values.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. mysql: - imageTag: "5.7.34" + imageTag: "5.7.37" mysqlRootPassword: root mysqlUser: wso2carbon mysqlPassword: wso2carbon @@ -219,7 +219,7 @@ mysql: CREATE TABLE IF NOT EXISTS IDN_OAUTH2_ACCESS_TOKEN_SCOPE ( TOKEN_ID VARCHAR (255), - TOKEN_SCOPE VARCHAR (60), + TOKEN_SCOPE VARCHAR (100), TENANT_ID INTEGER DEFAULT -1, PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE), FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE @@ -1404,9 +1404,10 @@ mysql: UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UUID VARCHAR(256), TOKEN_TYPE VARCHAR(10), + ORGANIZATION VARCHAR(100), FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT, PRIMARY KEY(APPLICATION_ID), - UNIQUE (NAME,SUBSCRIBER_ID), + UNIQUE (NAME,SUBSCRIBER_ID,ORGANIZATION), UNIQUE (UUID) )ENGINE INNODB; @@ -1420,24 +1421,21 @@ mysql: CONTEXT_TEMPLATE VARCHAR(256), API_TIER VARCHAR(256), API_TYPE VARCHAR(10), + ORGANIZATION VARCHAR(100), + GATEWAY_VENDOR VARCHAR(100) DEFAULT 'wso2', CREATED_BY VARCHAR(100), CREATED_TIME TIMESTAMP, UPDATED_BY VARCHAR(100), UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, STATUS VARCHAR(30), + LOG_LEVEL VARCHAR(255) DEFAULT 'OFF', REVISIONS_CREATED INTEGER DEFAULT 0, + VERSION_COMPARABLE VARCHAR(15), PRIMARY KEY(API_ID), - UNIQUE (API_PROVIDER,API_NAME,API_VERSION), + UNIQUE (API_PROVIDER,API_NAME,API_VERSION,ORGANIZATION), UNIQUE (API_UUID) )ENGINE INNODB; - CREATE TABLE IF NOT EXISTS AM_API_REVISION_METADATA ( - API_UUID VARCHAR(64), - REVISION_UUID VARCHAR(64), - API_TIER VARCHAR(128), - UNIQUE (API_UUID,REVISION_UUID) - )ENGINE INNODB; - CREATE TABLE IF NOT EXISTS AM_GRAPHQL_COMPLEXITY ( UUID VARCHAR(256), API_ID INTEGER NOT NULL, @@ -1472,7 +1470,7 @@ mysql: CREATE TABLE IF NOT EXISTS AM_SECURITY_AUDIT_UUID_MAPPING ( API_ID INTEGER NOT NULL, AUDIT_UUID VARCHAR(255) NOT NULL, - FOREIGN KEY (API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT, + FOREIGN KEY (API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE CASCADE, PRIMARY KEY (API_ID) )ENGINE INNODB; @@ -1500,8 +1498,8 @@ mysql: UPDATED_BY VARCHAR(100), UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UUID VARCHAR(256), - FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT, - FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT, + FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE CASCADE, PRIMARY KEY (SUBSCRIPTION_ID), UNIQUE (UUID) )ENGINE INNODB; @@ -1517,7 +1515,7 @@ mysql: CREATE_MODE VARCHAR(30) DEFAULT 'CREATED', KEY_MANAGER VARCHAR(100), APP_INFO BLOB , - FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT, + FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE CASCADE, PRIMARY KEY(APPLICATION_ID,KEY_TYPE,KEY_MANAGER) )ENGINE INNODB; @@ -1529,7 +1527,7 @@ mysql: USER_ID VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, EVENT_DATE TIMESTAMP NOT NULL, - FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT, + FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE CASCADE, PRIMARY KEY (EVENT_ID) )ENGINE INNODB; @@ -1549,7 +1547,7 @@ mysql: PARENT_COMMENT_ID VARCHAR(64) DEFAULT NULL, ENTRY_POINT VARCHAR(20), CATEGORY VARCHAR(20) DEFAULT 'general', - FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID), + FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE, FOREIGN KEY(PARENT_COMMENT_ID) REFERENCES AM_API_COMMENTS(COMMENT_ID), PRIMARY KEY (COMMENT_ID) )ENGINE INNODB; @@ -1559,7 +1557,7 @@ mysql: API_ID INTEGER, RATING INTEGER, SUBSCRIBER_ID INTEGER, - FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT, + FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT, PRIMARY KEY (RATING_ID) )ENGINE INNODB; @@ -1615,7 +1613,7 @@ mysql: KEY_MANAGER VARCHAR(255) NOT NULL, UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE,KEY_MANAGER), FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT, - FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT, + FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE CASCADE, PRIMARY KEY (REG_ID) )ENGINE INNODB; @@ -1632,6 +1630,7 @@ mysql: API_PROVIDER VARCHAR(256) NOT NULL , DEFAULT_API_VERSION VARCHAR(30) , PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) , + ORGANIZATION VARCHAR(100), PRIMARY KEY (DEFAULT_VERSION_ID) )ENGINE = INNODB; @@ -1851,7 +1850,7 @@ mysql: CREATE TABLE `AM_BLOCK_CONDITIONS` ( `CONDITION_ID` int(11) NOT NULL AUTO_INCREMENT, `TYPE` varchar(45) DEFAULT NULL, - `VALUE` varchar(512) DEFAULT NULL, + `BLOCK_CONDITION` varchar(512) DEFAULT NULL, `ENABLED` varchar(45) DEFAULT NULL, `DOMAIN` varchar(45) DEFAULT NULL, `UUID` VARCHAR(256), @@ -1907,7 +1906,7 @@ mysql: CREATE TABLE IF NOT EXISTS AM_APPLICATION_ATTRIBUTES ( APPLICATION_ID int(11) NOT NULL, NAME varchar(255) NOT NULL, - VALUE varchar(1024) NOT NULL, + APP_ATTRIBUTE varchar(1024) NOT NULL, TENANT_ID int(11) NOT NULL, PRIMARY KEY (APPLICATION_ID,NAME), FOREIGN KEY (APPLICATION_ID) REFERENCES AM_APPLICATION (APPLICATION_ID) ON DELETE CASCADE ON UPDATE CASCADE @@ -1947,8 +1946,8 @@ mysql: UUID VARCHAR(50), NAME VARCHAR(255), DESCRIPTION VARCHAR(1024), - TENANT_ID INTEGER DEFAULT -1, - UNIQUE (NAME,TENANT_ID), + ORGANIZATION VARCHAR(100), + UNIQUE (NAME,ORGANIZATION), PRIMARY KEY (UUID) ) ENGINE=InnoDB; @@ -2049,9 +2048,11 @@ mysql: TYPE VARCHAR(45) NULL, CONFIGURATION BLOB NULL, ENABLED BOOLEAN DEFAULT 1, - TENANT_DOMAIN VARCHAR(100) NULL, + ORGANIZATION VARCHAR(100) NULL, + TOKEN_TYPE VARCHAR(45) NULL, + EXTERNAL_REFERENCE_ID VARCHAR(100) NULL, PRIMARY KEY (UUID), - UNIQUE (NAME,TENANT_DOMAIN) + UNIQUE (NAME,ORGANIZATION) ); -- AM_GW_PUBLISHED_API_DETAILS & AM_GW_API_ARTIFACTS are independent tables for Artifact synchronizer feature which -- @@ -2069,10 +2070,10 @@ mysql: CREATE TABLE IF NOT EXISTS AM_GW_API_ARTIFACTS ( API_ID VARCHAR(255) NOT NULL, REVISION_ID VARCHAR(255) NOT NULL, - ARTIFACT blob, + ARTIFACT MEDIUMBLOB, TIME_STAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (REVISION_ID, API_ID), - FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID) ON UPDATE CASCADE ON DELETE NO ACTION + FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID) ON UPDATE CASCADE ON DELETE CASCADE )ENGINE=InnoDB; CREATE TABLE IF NOT EXISTS AM_GW_API_DEPLOYMENTS ( @@ -2081,7 +2082,7 @@ mysql: LABEL VARCHAR(255) NOT NULL, VHOST VARCHAR(255) NULL, PRIMARY KEY (REVISION_ID, API_ID,LABEL), - FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID) ON UPDATE CASCADE ON DELETE NO ACTION + FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB; CREATE TABLE IF NOT EXISTS AM_SCOPE ( @@ -2109,7 +2110,16 @@ mysql: CREATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, CREATED_BY VARCHAR(255), PRIMARY KEY (ID, API_UUID), - UNIQUE(REVISION_UUID) + UNIQUE(REVISION_UUID), + FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE + )ENGINE INNODB; + + CREATE TABLE IF NOT EXISTS AM_API_REVISION_METADATA ( + API_UUID VARCHAR(64), + REVISION_UUID VARCHAR(255), + API_TIER VARCHAR(128), + UNIQUE (API_UUID,REVISION_UUID), + FOREIGN KEY(REVISION_UUID) REFERENCES AM_REVISION(REVISION_UUID) ON DELETE CASCADE )ENGINE INNODB; CREATE TABLE IF NOT EXISTS AM_DEPLOYMENT_REVISION_MAPPING ( @@ -2122,15 +2132,25 @@ mysql: FOREIGN KEY (REVISION_UUID) REFERENCES AM_REVISION(REVISION_UUID) ON UPDATE CASCADE ON DELETE CASCADE )ENGINE INNODB; + CREATE TABLE IF NOT EXISTS AM_DEPLOYED_REVISION ( + NAME VARCHAR(255) NOT NULL, + VHOST VARCHAR(255) NULL, + REVISION_UUID VARCHAR(255) NOT NULL, + DEPLOYED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (NAME, REVISION_UUID), + FOREIGN KEY (REVISION_UUID) REFERENCES AM_REVISION(REVISION_UUID) ON UPDATE CASCADE ON DELETE CASCADE + )ENGINE INNODB; + -- Gateway Environments Table -- CREATE TABLE IF NOT EXISTS AM_GATEWAY_ENVIRONMENT ( ID INTEGER NOT NULL AUTO_INCREMENT, UUID VARCHAR(45) NOT NULL, NAME VARCHAR(255) NOT NULL, - TENANT_DOMAIN VARCHAR(255) NOT NULL, DISPLAY_NAME VARCHAR(255) NULL, DESCRIPTION VARCHAR(1023) NULL, - UNIQUE (NAME, TENANT_DOMAIN), + PROVIDER VARCHAR(255) NOT NULL, + ORGANIZATION VARCHAR(255) NOT NULL, + UNIQUE (NAME, ORGANIZATION), UNIQUE (UUID), PRIMARY KEY (ID) ); @@ -2209,11 +2229,87 @@ mysql: ADDED_AT TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP )ENGINE INNODB; + CREATE TABLE IF NOT EXISTS AM_API_ENVIRONMENT_KEYS + ( + UUID VARCHAR(45) NOT NULL, + ENVIRONMENT_ID VARCHAR(45) NOT NULL, + API_UUID VARCHAR(256) NOT NULL, + PROPERTY_CONFIG BLOB DEFAULT NULL, + UNIQUE (ENVIRONMENT_ID, API_UUID), + FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, + PRIMARY KEY (UUID) + )ENGINE INNODB; + + CREATE TABLE IF NOT EXISTS AM_OPERATION_POLICY ( + POLICY_UUID VARCHAR(45) NOT NULL, + POLICY_NAME VARCHAR(300) NOT NULL, + POLICY_VERSION VARCHAR(45) DEFAULT 'v1', + DISPLAY_NAME VARCHAR(300) NOT NULL, + POLICY_DESCRIPTION VARCHAR(1024), + APPLICABLE_FLOWS VARCHAR(45) NOT NULL, + GATEWAY_TYPES VARCHAR(45) NOT NULL, + API_TYPES VARCHAR(45) NOT NULL, + POLICY_PARAMETERS blob, + ORGANIZATION VARCHAR(100), + POLICY_CATEGORY VARCHAR(45) NOT NULL, + POLICY_MD5 VARCHAR(45) NOT NULL, + PRIMARY KEY(POLICY_UUID) + )ENGINE INNODB; + + CREATE TABLE IF NOT EXISTS AM_OPERATION_POLICY_DEFINITION ( + DEFINITION_ID INTEGER AUTO_INCREMENT, + POLICY_UUID VARCHAR(45) NOT NULL, + POLICY_DEFINITION blob NOT NULL, + GATEWAY_TYPE VARCHAR(20) NOT NULL, + DEFINITION_MD5 VARCHAR(45) NOT NULL, + UNIQUE (POLICY_UUID, GATEWAY_TYPE), + FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, + PRIMARY KEY(DEFINITION_ID) + )ENGINE INNODB; + + CREATE TABLE IF NOT EXISTS AM_COMMON_OPERATION_POLICY ( + COMMON_POLICY_ID INTEGER AUTO_INCREMENT, + POLICY_UUID VARCHAR(45) NOT NULL, + FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, + PRIMARY KEY(COMMON_POLICY_ID) + )ENGINE INNODB; + + CREATE TABLE IF NOT EXISTS AM_API_OPERATION_POLICY ( + API_SPECIFIC_POLICY_ID INTEGER AUTO_INCREMENT, + POLICY_UUID VARCHAR(45) NOT NULL, + API_UUID VARCHAR(45) NOT NULL, + REVISION_UUID VARCHAR(45), + CLONED_POLICY_UUID VARCHAR(45), + FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, + PRIMARY KEY(API_SPECIFIC_POLICY_ID) + )ENGINE INNODB; + + CREATE TABLE IF NOT EXISTS AM_API_OPERATION_POLICY_MAPPING ( + OPERATION_POLICY_MAPPING_ID INTEGER AUTO_INCREMENT, + URL_MAPPING_ID INTEGER NOT NULL, + POLICY_UUID VARCHAR(45) NOT NULL, + POLICY_ORDER INTEGER NOT NULL, + DIRECTION VARCHAR(10) NOT NULL, + PARAMETERS VARCHAR(1024) NOT NULL, + FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, + FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, + PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) + )ENGINE INNODB; + + CREATE TABLE IF NOT EXISTS AM_SYSTEM_CONFIGS + ( + ORGANIZATION VARCHAR(100) NOT NULL, + CONFIG_TYPE VARCHAR(100) NOT NULL, + CONFIGURATION BLOB NOT NULL, + PRIMARY KEY (ORGANIZATION,CONFIG_TYPE) + )ENGINE INNODB; + -- Performance indexes start-- create index IDX_ITS_LMT on IDN_THRIFT_SESSION (LAST_MODIFIED_TIME); create index IDX_IOAT_UT on IDN_OAUTH2_ACCESS_TOKEN (USER_TYPE); create index IDX_AAI_CTX on AM_API (CONTEXT); + create index IDX_AAI_ORG on AM_API (ORGANIZATION); create index IDX_AAKM_CK on AM_APPLICATION_KEY_MAPPING (CONSUMER_KEY); create index IDX_AAUM_AI on AM_API_URL_MAPPING (API_ID); create index IDX_AAPM_AI on AM_API_PRODUCT_MAPPING (API_ID); @@ -2232,6 +2328,7 @@ mysql: GRANT ALL ON WSO2AM_SHARED_DB.* TO 'wso2carbon'@'%' IDENTIFIED BY 'wso2carbon'; USE WSO2AM_SHARED_DB; + CREATE TABLE IF NOT EXISTS REG_CLUSTER_LOCK ( REG_LOCK_NAME VARCHAR (20), REG_LOCK_STATUS VARCHAR (20), @@ -2394,6 +2491,7 @@ mysql: ALTER TABLE REG_RESOURCE_TAG ADD CONSTRAINT REG_RESOURCE_TAG_FK_BY_TAG_ID FOREIGN KEY (REG_TAG_ID, REG_TENANT_ID) REFERENCES REG_TAG (REG_ID, REG_TENANT_ID); CREATE INDEX REG_RESOURCE_TAG_IND_BY_PATH_ID_AND_RESOURCE_NAME USING HASH ON REG_RESOURCE_TAG(REG_PATH_ID, REG_RESOURCE_NAME, REG_TENANT_ID); CREATE INDEX REG_RESOURCE_TAG_IND_BY_VERSION USING HASH ON REG_RESOURCE_TAG(REG_VERSION, REG_TENANT_ID); + CREATE INDEX REG_RESOURCE_TAG_IND_BY_REG_TAG_ID USING HASH ON REG_RESOURCE_TAG(REG_TAG_ID, REG_TENANT_ID); CREATE TABLE IF NOT EXISTS REG_PROPERTY ( REG_ID INTEGER NOT NULL AUTO_INCREMENT, @@ -2415,6 +2513,7 @@ mysql: ALTER TABLE REG_RESOURCE_PROPERTY ADD CONSTRAINT REG_RESOURCE_PROPERTY_FK_BY_TAG_ID FOREIGN KEY (REG_PROPERTY_ID, REG_TENANT_ID) REFERENCES REG_PROPERTY (REG_ID, REG_TENANT_ID); CREATE INDEX REG_RESOURCE_PROPERTY_IND_BY_PATH_ID_AND_RESOURCE_NAME USING HASH ON REG_RESOURCE_PROPERTY(REG_PATH_ID, REG_RESOURCE_NAME, REG_TENANT_ID); CREATE INDEX REG_RESOURCE_PROPERTY_IND_BY_VERSION USING HASH ON REG_RESOURCE_PROPERTY(REG_VERSION, REG_TENANT_ID); + CREATE INDEX REG_RESOURCE_PROPERTY_IND_BY_REG_PROP_ID ON REG_RESOURCE_PROPERTY(REG_TENANT_ID, REG_PROPERTY_ID); -- CREATE TABLE IF NOT EXISTS REG_ASSOCIATIONS ( -- SRC_PATH_ID INTEGER, From cfbe29154a370367f11e051f830b22f98acc7b27 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 08:45:31 +0530 Subject: [PATCH 05/15] Update am/single pattern for 4.1.0 release --- simple/am-single/Chart.yaml | 4 ++-- simple/am-single/requirements.yaml | 2 +- .../templates/am/instance/wso2am-deployment.yaml | 16 ++++++---------- .../am/instance/wso2am-single-node-am-conf.yaml | 11 ++++++++++- .../templates/am/wso2am-volume-claims.yaml | 6 ++++-- simple/am-single/values.yaml | 4 ++-- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/simple/am-single/Chart.yaml b/simple/am-single/Chart.yaml index a632a933..2701c79f 100644 --- a/simple/am-single/Chart.yaml +++ b/simple/am-single/Chart.yaml @@ -13,8 +13,8 @@ # limitations under the License. apiVersion: v1 -appVersion: "4.0.0" +appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Manager Single Node. name: am-single-node -version: 4.0.0-1 +version: 4.1.0-1 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/simple/am-single/requirements.yaml b/simple/am-single/requirements.yaml index 074adea6..c1db5997 100644 --- a/simple/am-single/requirements.yaml +++ b/simple/am-single/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: mysql-am - version: "4.0.0-1" + version: "4.1.0-1" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.mysql - name: nfs-server-provisioner diff --git a/simple/am-single/templates/am/instance/wso2am-deployment.yaml b/simple/am-single/templates/am/instance/wso2am-deployment.yaml index dc04dd99..59072a18 100644 --- a/simple/am-single/templates/am/instance/wso2am-deployment.yaml +++ b/simple/am-single/templates/am/instance/wso2am-deployment.yaml @@ -56,19 +56,15 @@ spec: {{- include "image" (dict "Values" .Values "deployment" .Values.wso2.deployment.am) | indent 10 }} imagePullPolicy: {{ .Values.wso2.deployment.am.imagePullPolicy }} livenessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.readinessProbe.periodSeconds }} lifecycle: diff --git a/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml b/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml index f7ad96ca..6d429e59 100644 --- a/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml +++ b/simple/am-single/templates/am/instance/wso2am-single-node-am-conf.yaml @@ -63,6 +63,9 @@ data: alias = "wso2carbon" key_password = "wso2carbon" + #[keystore.listener_profile] + #bind_address = "0.0.0.0" + #[keystore.primary] #file_name = "wso2carbon.jks" #type = "JKS" @@ -80,6 +83,7 @@ data: [[apim.gateway.environment]] name = "Default" type = "hybrid" + provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true @@ -123,7 +127,7 @@ data: #[apim.cache.tags] #expiry_time = "2m" - + {{ if .Values.wso2.choreoAnalytics.enabled }} [apim.analytics] enable = true @@ -288,6 +292,11 @@ data: [transport.https.properties] proxyPort = 443 + [oauth.grant_type.token_exchange] + enable = true + allow_refresh_tokens = true + iat_validity_period = "1h" + {{ if .Values.wso2.deployment.persistentRuntimeArtifacts.apacheSolrIndexing.enabled }} [database.local] url = "jdbc:h2:/home/wso2carbon/solr/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE" diff --git a/simple/am-single/templates/am/wso2am-volume-claims.yaml b/simple/am-single/templates/am/wso2am-volume-claims.yaml index 77054ad4..8cfc6efc 100644 --- a/simple/am-single/templates/am/wso2am-volume-claims.yaml +++ b/simple/am-single/templates/am/wso2am-volume-claims.yaml @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. + {{ if .Values.wso2.deployment.persistentRuntimeArtifacts.apacheSolrIndexing.enabled }} +--- + apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -39,5 +42,4 @@ spec: requests: storage: {{ .Values.wso2.deployment.persistentRuntimeArtifacts.apacheSolrIndexing.capacity.solrIndexedData }} storageClassName: {{ .Values.wso2.deployment.persistentRuntimeArtifacts.storageClass }} - ---- + {{ end }} diff --git a/simple/am-single/values.yaml b/simple/am-single/values.yaml index 6f38ac6a..1cc80742 100644 --- a/simple/am-single/values.yaml +++ b/simple/am-single/values.yaml @@ -46,7 +46,7 @@ wso2: apacheSolrIndexing: # Indicates if persistence of the runtime artifacts for Apache Solr-based indexing is enabled # By default, this is disabled - enabled: false + enabled: true # Define capacities for persistent runtime artifact directories capacity: # For persisting the H2 based local Carbon database file @@ -59,7 +59,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value # dockerRegistry: "" imageName: "wso2am" - imageTag: "4.0.0" + imageTag: "4.1.0" # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always From bb22f2261ccdeb10f66df5860e1f17aa546ac790 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 08:59:43 +0530 Subject: [PATCH 06/15] Update advanced/am-pattern-1 for 4.1.0 release --- advanced/am-pattern-1/Chart.yaml | 4 ++-- advanced/am-pattern-1/requirements.yaml | 2 +- .../am/instance-1/wso2am-pattern-1-am-conf.yaml | 17 +++++++++++++---- .../wso2am-pattern-1-am-deployment.yaml | 16 ++++++---------- .../am/instance-2/wso2am-pattern-1-am-conf.yaml | 17 +++++++++++++---- .../wso2am-pattern-1-am-deployment.yaml | 16 ++++++---------- .../wso2am-pattern-1-mi-management-ingress.yaml | 9 ++++++--- advanced/am-pattern-1/values.yaml | 10 +++++----- 8 files changed, 52 insertions(+), 39 deletions(-) diff --git a/advanced/am-pattern-1/Chart.yaml b/advanced/am-pattern-1/Chart.yaml index 7d7dc14a..2b75d11b 100644 --- a/advanced/am-pattern-1/Chart.yaml +++ b/advanced/am-pattern-1/Chart.yaml @@ -13,8 +13,8 @@ # limitations under the License. apiVersion: v1 -appVersion: "4.0.0" +appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Manager Pattern 1 (HA All-In-One Deployment) name: am-pattern-1 -version: 4.0.0-2 +version: 4.1.0-1 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-1/requirements.yaml b/advanced/am-pattern-1/requirements.yaml index 008768be..44081fff 100644 --- a/advanced/am-pattern-1/requirements.yaml +++ b/advanced/am-pattern-1/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: mysql-am - version: "4.0.0-1" + version: "4.1.0-1" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.mysql - name: nfs-server-provisioner diff --git a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml index 830281da..c40ea8a0 100644 --- a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml +++ b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml @@ -24,7 +24,7 @@ data: {{ tpl $content $ | indent 4 }} {{- end }} - {{ else }} + {{ else }} data: deployment.toml: |- [server] @@ -63,6 +63,9 @@ data: alias = "wso2carbon" key_password = "wso2carbon" + #[keystore.listener_profile] + #bind_address = "0.0.0.0" + #[keystore.primary] #file_name = "wso2carbon.jks" #type = "JKS" @@ -80,6 +83,7 @@ data: [[apim.gateway.environment]] name = "Default" type = "hybrid" + provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true @@ -215,14 +219,14 @@ data: #port = 10005 [[apim.throttling.url_group]] - traffic_manager_urls = ["tcp://localhost:9611"] - traffic_manager_auth_urls = ["ssl://localhost:9711"] + traffic_manager_urls = ["tcp://{{ template "am-pattern-1.resource.prefix" . }}-am-1-service:9611"] + traffic_manager_auth_urls = ["ssl://{{ template "am-pattern-1.resource.prefix" . }}-am-1-service:9711"] type = "loadbalance" [[apim.throttling.url_group]] traffic_manager_urls = ["tcp://{{ template "am-pattern-1.resource.prefix" . }}-am-2-service:9611"] traffic_manager_auth_urls = ["ssl://{{ template "am-pattern-1.resource.prefix" . }}-am-2-service:9711"] - type = "failover" + type = "loadbalance" #[apim.workflow] #enable = false @@ -289,6 +293,11 @@ data: [transport.https.properties] proxyPort = 443 + [oauth.grant_type.token_exchange] + enable = true + allow_refresh_tokens = true + iat_validity_period = "1h" + [transport.passthru_https.sender.parameters] HostnameVerifier = "AllowAll" diff --git a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml index d739923d..1fd72366 100644 --- a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml +++ b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml @@ -56,19 +56,15 @@ spec: {{- include "image" (dict "Values" .Values "deployment" .Values.wso2.deployment.am) | indent 10 }} imagePullPolicy: {{ .Values.wso2.deployment.am.imagePullPolicy }} livenessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml index 411ae127..8a488952 100644 --- a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml +++ b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-conf.yaml @@ -24,7 +24,7 @@ data: {{ tpl $content $ | indent 4 }} {{- end }} - {{ else }} + {{ else }} data: deployment.toml: |- [server] @@ -63,6 +63,9 @@ data: alias = "wso2carbon" key_password = "wso2carbon" + #[keystore.listener_profile] + #bind_address = "0.0.0.0" + #[keystore.primary] #file_name = "wso2carbon.jks" #type = "JKS" @@ -80,6 +83,7 @@ data: [[apim.gateway.environment]] name = "Default" type = "hybrid" + provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true @@ -215,14 +219,14 @@ data: #port = 10005 [[apim.throttling.url_group]] - traffic_manager_urls = ["tcp://localhost:9611"] - traffic_manager_auth_urls = ["ssl://localhost:9711"] + traffic_manager_urls = ["tcp://{{ template "am-pattern-1.resource.prefix" . }}-am-2-service:9611"] + traffic_manager_auth_urls = ["ssl://{{ template "am-pattern-1.resource.prefix" . }}-am-2-service:9711"] type = "loadbalance" [[apim.throttling.url_group]] traffic_manager_urls = ["tcp://{{ template "am-pattern-1.resource.prefix" . }}-am-1-service:9611"] traffic_manager_auth_urls = ["ssl://{{ template "am-pattern-1.resource.prefix" . }}-am-1-service:9711"] - type = "failover" + type = "loadbalance" #[apim.workflow] #enable = false @@ -289,6 +293,11 @@ data: [transport.https.properties] proxyPort = 443 + [oauth.grant_type.token_exchange] + enable = true + allow_refresh_tokens = true + iat_validity_period = "1h" + [transport.passthru_https.sender.parameters] HostnameVerifier = "AllowAll" diff --git a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml index d4e75d1b..429d8f68 100644 --- a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml +++ b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml @@ -56,19 +56,15 @@ spec: {{- include "image" (dict "Values" .Values "deployment" .Values.wso2.deployment.am) | indent 10 }} imagePullPolicy: {{ .Values.wso2.deployment.am.imagePullPolicy }} livenessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.readinessProbe.periodSeconds }} lifecycle: 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..99c23e93 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 @@ -30,6 +30,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ template "am-pattern-1.resource.prefix" . }}-mi-1-service - servicePort: 9164 + service: + name: {{ template "am-pattern-1.resource.prefix" . }}-mi-1-service + port: + number: 9164 diff --git a/advanced/am-pattern-1/values.yaml b/advanced/am-pattern-1/values.yaml index 976eb1fd..68d771a3 100644 --- a/advanced/am-pattern-1/values.yaml +++ b/advanced/am-pattern-1/values.yaml @@ -59,7 +59,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value # dockerRegistry: "" imageName: "wso2am" - imageTag: "4.0.0" + imageTag: "4.1.0" # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always @@ -99,9 +99,9 @@ wso2: # If the deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml), # add the customized configuration file under (wso2 -> deployment -> am -> config -> deployment.toml) - # config: "" - # deployment.toml: |- - # # deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) + # config: + # deployment.toml: |- + # # deployment configurations for the WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) # Configure Ingresses ingress: @@ -136,7 +136,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value. # dockerRegistry: "" imageName: "wso2mi" - imageTag: "4.0.0" + imageTag: "4.1.0" # Number of deployment replicas replicas: 2 strategy: From 7b4d56c240640832887165e5e2f9009e6bddb80f Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 09:05:08 +0530 Subject: [PATCH 07/15] Update advanced/am-pattern-2 for 4.1.0 release --- advanced/am-pattern-2/Chart.yaml | 4 ++-- advanced/am-pattern-2/requirements.yaml | 2 +- advanced/am-pattern-2/values.yaml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/advanced/am-pattern-2/Chart.yaml b/advanced/am-pattern-2/Chart.yaml index 793a9332..2b8aefda 100644 --- a/advanced/am-pattern-2/Chart.yaml +++ b/advanced/am-pattern-2/Chart.yaml @@ -13,8 +13,8 @@ # limitations under the License. apiVersion: v1 -appVersion: "4.0.0" +appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Management deployment pattern 2 name: am-pattern-2 -version: 4.0.0-2 +version: 4.1.0-1 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-2/requirements.yaml b/advanced/am-pattern-2/requirements.yaml index f53f5fcb..c8ed1f7d 100644 --- a/advanced/am-pattern-2/requirements.yaml +++ b/advanced/am-pattern-2/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: am-pattern-1 - version: "4.0.0-1" + version: "4.1.0-1" repository: "https://helm.wso2.com" diff --git a/advanced/am-pattern-2/values.yaml b/advanced/am-pattern-2/values.yaml index 75efdab6..38e35901 100644 --- a/advanced/am-pattern-2/values.yaml +++ b/advanced/am-pattern-2/values.yaml @@ -25,7 +25,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value. # dockerRegistry: "" imageName: "wso2mi" - imageTag: "4.0.0" + imageTag: "4.1.0" # Number of deployment replicas replicas: 2 strategy: @@ -128,7 +128,7 @@ am-pattern-1: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value # dockerRegistry: "" imageName: "wso2am" - imageTag: "4.0.0" + imageTag: "4.1.0" # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always @@ -205,7 +205,7 @@ am-pattern-1: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value. # dockerRegistry: "" imageName: "wso2mi" - imageTag: "4.0.0" + imageTag: "4.1.0" # Number of deployment replicas replicas: 2 strategy: From d29a2461b0c27a4c44e39ab8d084769c27a07a5d Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 09:12:52 +0530 Subject: [PATCH 08/15] Update advanced/am-pattern-3 for 4.1.0 release --- advanced/am-pattern-3/Chart.yaml | 4 ++-- advanced/am-pattern-3/requirements.yaml | 2 +- ...wso2am-pattern-3-am-control-plane-conf.yaml | 9 ++++----- ...-pattern-3-am-control-plane-deployment.yaml | 13 +++++-------- ...wso2am-pattern-3-am-control-plane-conf.yaml | 9 ++++----- ...-pattern-3-am-control-plane-deployment.yaml | 13 +++++-------- ...ern-3-am-control-plane-conf-entrypoint.yaml | 18 ------------------ ...wso2am-pattern-3-am-gateway-deployment.yaml | 16 ++++++---------- advanced/am-pattern-3/values.yaml | 4 ++-- 9 files changed, 29 insertions(+), 59 deletions(-) diff --git a/advanced/am-pattern-3/Chart.yaml b/advanced/am-pattern-3/Chart.yaml index 34a6b156..2730742c 100644 --- a/advanced/am-pattern-3/Chart.yaml +++ b/advanced/am-pattern-3/Chart.yaml @@ -13,8 +13,8 @@ # limitations under the License. apiVersion: v1 -appVersion: "4.0.0" +appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Management deployment pattern 3 name: am-pattern-3 -version: 4.0.0-2 +version: 4.1.0-1 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-3/requirements.yaml b/advanced/am-pattern-3/requirements.yaml index 687ffdad..a3a981eb 100644 --- a/advanced/am-pattern-3/requirements.yaml +++ b/advanced/am-pattern-3/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: mysql-am - version: "4.0.0-1" + version: "4.1.0-1" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.mysql - name: nfs-server-provisioner diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml index 3579db65..a8e35722 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml @@ -25,8 +25,6 @@ data: {{- end }} {{ else }} - - {{ else }} data: deployment.toml: |- [server] @@ -82,6 +80,7 @@ data: [[apim.gateway.environment]] name = "Default" type = "hybrid" + provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true @@ -164,9 +163,9 @@ data: [apim.throttling] event_duplicate_url = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-2-service:5672"] service_url = "https://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/" - #enable_data_publishing = true - #enable_policy_deploy = true - #enable_blacklist_condition = true + enable_data_publishing = true + enable_policy_deploy = true + enable_blacklist_condition = true #enable_persistence = true throttle_decision_endpoints = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-1-service:5672","tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-2-service:5672"] diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml index b6d4377c..f1312822 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml @@ -66,16 +66,13 @@ spec: failureThreshold: {{ .Values.wso2.deployment.am.cp.startupProbe.failureThreshold }} livenessProbe: httpGet: - path: /carbon/admin/login.jsp - port: 9443 - scheme: HTTPS + path: /services/Version + port: 9763 periodSeconds: {{ .Values.wso2.deployment.am.cp.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml index 23085411..0040f38c 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml @@ -25,8 +25,6 @@ data: {{- end }} {{ else }} - - {{ else }} data: deployment.toml: |- [server] @@ -83,6 +81,7 @@ data: [[apim.gateway.environment]] name = "Default" type = "hybrid" + provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true @@ -165,9 +164,9 @@ data: [apim.throttling] event_duplicate_url = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-1-service:5672"] service_url = "https://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/" - #enable_data_publishing = true - #enable_policy_deploy = true - #enable_blacklist_condition = true + enable_data_publishing = true + enable_policy_deploy = true + enable_blacklist_condition = true #enable_persistence = true throttle_decision_endpoints = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-1-service:5672","tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-2-service:5672"] diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml index 6798d234..5ae0b0b7 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml @@ -66,16 +66,13 @@ spec: failureThreshold: {{ .Values.wso2.deployment.am.cp.startupProbe.failureThreshold }} livenessProbe: httpGet: - path: /carbon/admin/login.jsp - port: 9443 - scheme: HTTPS + path: /services/Version + port: 9763 periodSeconds: {{ .Values.wso2.deployment.am.cp.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-conf-entrypoint.yaml b/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-conf-entrypoint.yaml index 8e22b6d5..623a8cb5 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-conf-entrypoint.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-conf-entrypoint.yaml @@ -38,24 +38,6 @@ data: # check if the WSO2 product home exists test ! -d ${WSO2_SERVER_HOME} && echo "WSO2 Docker product home does not exist" && exit 1 - # shared artifact directories - directories=("executionplans" "synapse-configs") - # if the original directory locations of artifacts to be synced between nodes are empty, - # copy the preserved, default content of these folders to these original locations - for shared_directory in ${directories[@]}; do - if test -d ${original_deployment_artifacts}/${shared_directory}; - then - if [[ -z "$(ls -A ${deployment_volume}/${shared_directory})" ]]; then - if ! cp -R ${original_deployment_artifacts}/${shared_directory}/* ${deployment_volume}/${shared_directory}; - then - echo "Failed to copy the preserved, default artifacts to original location (${deployment_volume}/${shared_directory})" - exit 1 - fi - echo "Successfully copied the preserved, default artifacts to original location (${deployment_volume}/${shared_directory})" - fi - fi - done - # Copying carbon_db if ! test -f /home/wso2carbon/solr/database/WSO2CARBON_DB.mv.db then diff --git a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml index 7cbcd8a3..14ad27ef 100644 --- a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml +++ b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml @@ -62,18 +62,14 @@ spec: periodSeconds: {{ .Values.wso2.deployment.am.startupProbe.periodSeconds }} failureThreshold: {{ .Values.wso2.deployment.am.startupProbe.failureThreshold }} livenessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 8243 + httpGet: + path: /services/Version + port: 9763 periodSeconds: {{ .Values.wso2.deployment.am.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 8243 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-3/values.yaml b/advanced/am-pattern-3/values.yaml index 0c506713..574f0844 100644 --- a/advanced/am-pattern-3/values.yaml +++ b/advanced/am-pattern-3/values.yaml @@ -59,7 +59,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value # dockerRegistry: "" imageName: "wso2am" - imageTag: "4.0.0" + imageTag: "4.1.0" # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always @@ -217,7 +217,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value. # dockerRegistry: "" imageName: "wso2mi" - imageTag: "4.0.0" + imageTag: "4.1.0" # Number of deployment replicas replicas: 2 strategy: From 56f7986eb37c9460fc5111a4106816f2f17cf8a8 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 09:19:26 +0530 Subject: [PATCH 09/15] Update advanced/am-pattern-4 for 4.1.0 release --- advanced/am-pattern-4/Chart.yaml | 4 ++-- advanced/am-pattern-4/requirements.yaml | 2 +- ...wso2am-pattern-4-am-control-plane-conf.yaml | 1 + ...-pattern-4-am-control-plane-deployment.yaml | 13 +++++-------- ...wso2am-pattern-4-am-control-plane-conf.yaml | 1 + ...-pattern-4-am-control-plane-deployment.yaml | 13 +++++-------- ...ern-4-am-control-plane-conf-entrypoint.yaml | 18 ------------------ ...wso2am-pattern-4-am-gateway-deployment.yaml | 16 ++++++---------- ...so2am-pattern-4-am-trafficmanager-conf.yaml | 1 - ...pattern-4-am-trafficmanager-deployment.yaml | 16 ++++++---------- ...so2am-pattern-4-am-trafficmanager-conf.yaml | 7 +------ ...pattern-4-am-trafficmanager-deployment.yaml | 16 ++++++---------- advanced/am-pattern-4/values.yaml | 5 ++--- 13 files changed, 36 insertions(+), 77 deletions(-) diff --git a/advanced/am-pattern-4/Chart.yaml b/advanced/am-pattern-4/Chart.yaml index 8c97f644..b67a1bb8 100644 --- a/advanced/am-pattern-4/Chart.yaml +++ b/advanced/am-pattern-4/Chart.yaml @@ -13,8 +13,8 @@ # limitations under the License. apiVersion: v1 -appVersion: "4.0.0" +appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Management deployment pattern 4 name: am-pattern-4 -version: 4.0.0-2 +version: 4.1.0-1 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-4/requirements.yaml b/advanced/am-pattern-4/requirements.yaml index c67d12e4..c1db5997 100644 --- a/advanced/am-pattern-4/requirements.yaml +++ b/advanced/am-pattern-4/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: mysql-am - version: "4.0.0-2" + version: "4.1.0-1" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.mysql - name: nfs-server-provisioner diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml index 7696c92a..eb34ad0a 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml @@ -80,6 +80,7 @@ data: [[apim.gateway.environment]] name = "Default" type = "hybrid" + provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml index 931fda85..b08df189 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml @@ -66,16 +66,13 @@ spec: failureThreshold: {{ .Values.wso2.deployment.am.cp.startupProbe.failureThreshold }} livenessProbe: httpGet: - path: /carbon/admin/login.jsp - port: 9443 - scheme: HTTPS + path: /services/Version + port: 9763 periodSeconds: {{ .Values.wso2.deployment.am.cp.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml index f832a218..98757696 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml @@ -81,6 +81,7 @@ data: [[apim.gateway.environment]] name = "Default" type = "hybrid" + provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml index bf7bc58c..499476e7 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml @@ -66,16 +66,13 @@ spec: failureThreshold: {{ .Values.wso2.deployment.am.cp.startupProbe.failureThreshold }} livenessProbe: httpGet: - path: /carbon/admin/login.jsp - port: 9443 - scheme: HTTPS + path: /services/Version + port: 9763 periodSeconds: {{ .Values.wso2.deployment.am.cp.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.cp.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-conf-entrypoint.yaml b/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-conf-entrypoint.yaml index bf873e7b..082a9924 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-conf-entrypoint.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/wso2am-pattern-4-am-control-plane-conf-entrypoint.yaml @@ -38,24 +38,6 @@ data: # check if the WSO2 product home exists test ! -d ${WSO2_SERVER_HOME} && echo "WSO2 Docker product home does not exist" && exit 1 - # shared artifact directories - directories=("executionplans" "synapse-configs") - # if the original directory locations of artifacts to be synced between nodes are empty, - # copy the preserved, default content of these folders to these original locations - for shared_directory in ${directories[@]}; do - if test -d ${original_deployment_artifacts}/${shared_directory}; - then - if [[ -z "$(ls -A ${deployment_volume}/${shared_directory})" ]]; then - if ! cp -R ${original_deployment_artifacts}/${shared_directory}/* ${deployment_volume}/${shared_directory}; - then - echo "Failed to copy the preserved, default artifacts to original location (${deployment_volume}/${shared_directory})" - exit 1 - fi - echo "Successfully copied the preserved, default artifacts to original location (${deployment_volume}/${shared_directory})" - fi - fi - done - # Copying carbon_db if ! test -f /home/wso2carbon/solr/database/WSO2CARBON_DB.mv.db then diff --git a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml index 6b40c42e..95b73288 100644 --- a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml @@ -65,18 +65,14 @@ spec: periodSeconds: {{ .Values.wso2.deployment.am.startupProbe.periodSeconds }} failureThreshold: {{ .Values.wso2.deployment.am.startupProbe.failureThreshold }} livenessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 8243 + httpGet: + path: /services/Version + port: 9763 periodSeconds: {{ .Values.wso2.deployment.am.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 8243 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml index 4e0b63ed..426fb30b 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml @@ -97,7 +97,6 @@ data: [[apim.throttling.url_group]] traffic_manager_urls = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:9611"] traffic_manager_auth_urls = ["ssl://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:9711"] - type = "loadbalance" [[apim.throttling.url_group]] traffic_manager_urls = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-2-service:9611"] diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml index 90c97b13..71adfcca 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml @@ -42,19 +42,15 @@ spec: {{- include "image" (dict "Values" .Values "deployment" .Values.wso2.deployment.am) | indent 10 }} imagePullPolicy: {{ .Values.wso2.deployment.am.imagePullPolicy }} livenessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.trafficmanager.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.trafficmanager.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.trafficmanager.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.trafficmanager.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml index d7ac0cc8..83f672d5 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml @@ -79,11 +79,6 @@ data: service_url = "https://{{ template "am-pattern-4.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/" username = "$ref{super_admin.username}" password = "$ref{super_admin.password}" - #pool.init_idle_capacity = 50 - #pool.max_idle = 100 - #key_validation_handler_type = "default" - #key_validation_handler_type = "custom" - #key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler" [apim.oauth_config] revoke_endpoint = "https://{{ template "am-pattern-4.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/revoke" @@ -97,7 +92,7 @@ data: #enable_policy_deploy = true #enable_blacklist_condition = true #enable_persistence = true - #throttle_decision_endpoints = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:5672","tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-2-service:5672"] + #throttle_decision_endpoints = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:5672","tcp://localhost:5672"] throttle_decision_endpoints = ["tcp://localhost:5672"] [[apim.throttling.url_group]] diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml index 2166290d..4a605418 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml @@ -42,19 +42,15 @@ spec: {{- include "image" (dict "Values" .Values "deployment" .Values.wso2.deployment.am) | indent 10 }} imagePullPolicy: {{ .Values.wso2.deployment.am.imagePullPolicy }} livenessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.trafficmanager.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.trafficmanager.livenessProbe.periodSeconds }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - nc -z localhost 9443 + httpGet: + path: /services/Version + port: 9763 initialDelaySeconds: {{ .Values.wso2.deployment.am.trafficmanager.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.wso2.deployment.am.trafficmanager.readinessProbe.periodSeconds }} lifecycle: diff --git a/advanced/am-pattern-4/values.yaml b/advanced/am-pattern-4/values.yaml index a5709536..251f9d9d 100644 --- a/advanced/am-pattern-4/values.yaml +++ b/advanced/am-pattern-4/values.yaml @@ -59,7 +59,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value # dockerRegistry: "" imageName: "wso2am" - imageTag: "4.0.0" + imageTag: "4.1.0" # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always @@ -149,7 +149,6 @@ wso2: # deployment.toml: |- # # deployment configurations for the Gateway profile of WSO2 API Manager v4.0.0 (/repository/conf/deployment.toml) - # API Manager's Traffic Manager specific configurations trafficmanager: # Indicates whether the container is running @@ -261,7 +260,7 @@ wso2: # If a custom image must be used, uncomment 'dockerRegistry' and provide its value. # dockerRegistry: "" imageName: "wso2mi" - imageTag: "4.0.0" + imageTag: "4.1.0" # Number of deployment replicas replicas: 2 strategy: From 5ceb4296d0bc7d16bed18a40005c7b118fe150df Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 09:30:24 +0530 Subject: [PATCH 10/15] Update changelog for 4.1.0 release --- CHANGELOG.md | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4d37bb8..bb153f19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,20 @@ # Changelog -All notable changes to Kubernetes and Helm resources for WSO2 API Management version `4.0.x` in each resource release, +All notable changes to Kubernetes and Helm resources for WSO2 API Management version `4.1.x` in each resource release, will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) -## [v4.0.0.1] - 2021-05-07 +## [v4.1.0.1] - 2022-03-31 ### Added -- Helm resources for API Manager Single Node Deployment (refer to [issue](https://github.com/wso2/kubernetes-apim/issues/498)). -- Helm resources for API Manager Advanced deployment patterns (refer to [issue](https://github.com/wso2/kubernetes-apim/issues/499)). -- Helm resources for MySQL (refer to [issue](https://github.com/wso2/kubernetes-apim/issues/504)). -- Configurations for Choreo Analytics (refer to [issue](https://github.com/wso2/kubernetes-apim/issues/500)). +- Helm resources for API Manager Single Node Deployment. +- Helm resources for API Manager Advanced deployment patterns. +- Helm resources for MySQL. +- Parameter configurations for ingress resources. -### Removed +### Modified -- Helm resources for API Manager Analytics. -- Script based K8s deployment to API Manager Simple deployment. - -For detailed information on the tasks carried out during this release, please see the GitHub milestone -[v4.0.0.1](https://github.com/wso2/kubernetes-apim/milestone/22) +- Ingress API version to networking.k8s.io/v1. +- Readiness and liveness probe endpoints. From 4601e1bfc32e232c00d18dd1ce911c1057cd7d6d Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Thu, 31 Mar 2022 09:37:26 +0530 Subject: [PATCH 11/15] Update readmes for 4.1.0 release --- advanced/am-pattern-1/README.md | 28 ++++++++++++------------- advanced/am-pattern-2/README.md | 36 ++++++++++++++++----------------- advanced/am-pattern-3/README.md | 36 ++++++++++++++++----------------- advanced/am-pattern-4/README.md | 30 +++++++++++++-------------- simple/am-single/README.md | 28 ++++++++++++------------- 5 files changed, 79 insertions(+), 79 deletions(-) diff --git a/advanced/am-pattern-1/README.md b/advanced/am-pattern-1/README.md index 32d4cd0e..59e2bfcc 100644 --- a/advanced/am-pattern-1/README.md +++ b/advanced/am-pattern-1/README.md @@ -2,10 +2,10 @@ This deployment consists of an API-M cluster with two nodes of the API-M runtime and two nodes each of the integration runtimes (Micro Integrator/Streaming Integrator). You can use this pattern if you expect to receive low traffic to your deployment. -![WSO2 API Manager pattern 1 deployment](https://apim.docs.wso2.com/en/4.0.0/assets/img/setup-and-install/basic-ha-deployment.png) +![WSO2 API Manager pattern 1 deployment](https://apim.docs.wso2.com/en/4.1.0/assets/img/setup-and-install/basic-ha-deployment.png) For advanced details on the deployment pattern, please refer to the official -[documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/deployment-overview/#standard-ha-deployment). +[documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/deployment-overview/#standard-ha-deployment). ## Contents @@ -59,13 +59,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --name wso2/am-pattern-1 --version 4.0.0-1 --namespace + helm install --name wso2/am-pattern-1 --version 4.1.0-1 --namespace ``` - Helm version 3 ``` - helm install wso2/am-pattern-1 --version 4.0.0-1 --namespace --create-namespace + helm install wso2/am-pattern-1 --version 4.1.0-1 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-pattern-1 --version 4.0.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -99,13 +99,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --dep-up --name /am-pattern-1 --version 4.0.0-1 --namespace + helm install --dep-up --name /am-pattern-1 --version 4.1.0-1 --namespace ``` - Helm version 3 ``` - helm install /am-pattern-1 --version 4.0.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-1 --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -116,7 +116,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-pattern-1 --version 4.0.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-pattern-1 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` Or else, you can configure the default configurations inside the am-pattern-1 helm chart [values.yaml](https://github.com/wso2/kubernetes-apim/blob/master/advanced/am-pattern-1/values.yaml) file. Refer [this](https://helm.sh/docs/chart_template_guide/values_files/) for to learn more details about the `values.yaml` file. @@ -132,7 +132,7 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-1 --version 4.0.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics @@ -144,13 +144,13 @@ The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-1 --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-1 --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -250,7 +250,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `wso2.deployment.am.dockerRegistry` | Registry location of the Docker image to be used to create API Manager instances | - | | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | -| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.am.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for API Manager node | 180 | | `wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager node | 10 | @@ -277,7 +277,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `wso2.deployment.mi.dockerRegistry` | Registry location of the Docker image to be used to create Micro Integrator instances | - | | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | -| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | @@ -338,5 +338,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-1 --version 4.0.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-1 --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` diff --git a/advanced/am-pattern-2/README.md b/advanced/am-pattern-2/README.md index e917db43..181ba728 100644 --- a/advanced/am-pattern-2/README.md +++ b/advanced/am-pattern-2/README.md @@ -2,10 +2,10 @@ This deployment consists of two API-M nodes and two nodes each of the integration runtimes (Micro Integrator/Streaming Integrator) per tenant. You can use this pattern when traffic from different tenants in the API-M cluster needs to be handled in isolation. This deployment also allows you to direct the traffic of each tenant to a separate integration cluster. -![WSO2 API Manager pattern 2 deployment](https://apim.docs.wso2.com/en/4.0.0/assets/img/setup-and-install/basic-ha-with-multitenancy.png) +![WSO2 API Manager pattern 2 deployment](https://apim.docs.wso2.com/en/4.1.0/assets/img/setup-and-install/basic-ha-with-multitenancy.png) For advanced details on the deployment pattern, please refer to the official -[documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/deployment-overview/#standard-ha-deployment-with-multitenancy). +[documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/deployment-overview/#standard-ha-deployment-with-multitenancy). ## Contents @@ -59,13 +59,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --name wso2/am-pattern-2 --version 4.0.0-1 --namespace + helm install --name wso2/am-pattern-2 --version 4.1.0-1 --namespace ``` - Helm version 3 ``` - helm install wso2/am-pattern-2 --version 4.0.0-1 --namespace --create-namespace + helm install wso2/am-pattern-2 --version 4.1.0-1 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -91,7 +91,7 @@ Below example is to provide WSO2 Subscription credentials for all WSO2 API Manag export SUBSCRIPTION_USERNAME= export SUBSCRIPTION_PASSWORD= -helm install --name wso2/am-pattern-2 --version 4.0.0-1 --namespace --set wso2.subscription.username=$SUBSCRIPTION_USERNAME --set wso2.subscription.password=$SUBSCRIPTION_PASSWORD --set am-pattern-1.wso2.subscription.username=$SUBSCRIPTION_USERNAME --set am-pattern-1.wso2.subscription.password=$SUBSCRIPTION_PASSWORD +helm install --name wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.subscription.username=$SUBSCRIPTION_USERNAME --set wso2.subscription.password=$SUBSCRIPTION_PASSWORD --set am-pattern-1.wso2.subscription.username=$SUBSCRIPTION_USERNAME --set am-pattern-1.wso2.subscription.password=$SUBSCRIPTION_PASSWORD ``` #### Install Chart From Source @@ -114,13 +114,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --dep-up --name /am-pattern-2 --version 4.0.0-1 --namespace + helm install --dep-up --name /am-pattern-2 --version 4.1.0-1 --namespace ``` - Helm version 3 ``` - helm install /am-pattern-2 --version 4.0.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-2 --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -131,7 +131,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-pattern-2 --version 4.0.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-pattern-2 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` Or else, you can configure the default configurations inside the am-pattern-1 helm chart [values.yaml](https://github.com/wso2/kubernetes-apim/blob/master/advanced/am-pattern-1/values.yaml) file. Refer [this](https://helm.sh/docs/chart_template_guide/values_files/) for to learn more details about the `values.yaml` file. @@ -139,7 +139,7 @@ Or else, you can configure the default configurations inside the am-pattern-1 he > **Note:**
From the above Helm commands, base image of a Micro Integrator is deployed (without any integration solution). To deploy your integration solution with the Helm charts follow the below steps.

->1. [Create an integration service using WSO2 Integration Studio and expose it as a Managed API](https://apim.docs.wso2.com/en/4.0.0/tutorials/integration-tutorials/service-catalog-tutorial/#exposing-an-integration-service-as-a-managed-api). Then [create a Docker image](https://apim.docs.wso2.com/en/4.0.0/integrate/develop/create-docker-project/#creating-docker-exporter) and push it to your private or public Docker registry.

+>1. [Create an integration service using WSO2 Integration Studio and expose it as a Managed API](https://apim.docs.wso2.com/en/4.1.0/tutorials/integration-tutorials/service-catalog-tutorial/#exposing-an-integration-service-as-a-managed-api). Then [create a Docker image](https://apim.docs.wso2.com/en/4.1.0/integrate/develop/create-docker-project/#creating-docker-exporter) and push it to your private or public Docker registry.

- `INTEGRATION_IMAGE_REGISTRY` will refer to the Docker registry that created Docker image has been pushed
- `INTEGRATION_IMAGE_NAME` will refer to the name of the created Docker image
- `INTEGRATION_IMAGE_TAG` will refer to the tag of the created Docker image

@@ -147,25 +147,25 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-2 --version 4.0.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics -If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.0.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. +If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.1.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-2 --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-2 --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -282,7 +282,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `am-pattern-1.wso2.deployment.am.dockerRegistry` | Registry location of the Docker image to be used to create API Manager instances | - | | `am-pattern-1.wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | -| `am-pattern-1.wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `am-pattern-1.wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `am-pattern-1.wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `am-pattern-1.wso2.deployment.am.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for API Manager node | 180 | | `am-pattern-1.wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager node | 10 | @@ -309,7 +309,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `am-pattern-1.wso2.deployment.mi.dockerRegistry` | Registry location of the Docker image to be used to create Micro Integrator instances | - | | `am-pattern-1.wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | -| `am-pattern-1.wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `am-pattern-1.wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `am-pattern-1.wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `am-pattern-1.wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `am-pattern-1.wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | @@ -329,7 +329,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `wso2.deployment.mi.dockerRegistry` | Registry location of the Docker image to be used to create Micro Integrator instances | - | | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | -| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | @@ -344,7 +344,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.mi.ingress.management.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | -**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/install/installation-prerequisites/). +**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/install/installation-prerequisites/). #### Kubernetes Specific Configurations @@ -391,5 +391,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-2 --version 4.0.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-2 --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` \ No newline at end of file diff --git a/advanced/am-pattern-3/README.md b/advanced/am-pattern-3/README.md index 7b5f41b9..0c7ba1c6 100644 --- a/advanced/am-pattern-3/README.md +++ b/advanced/am-pattern-3/README.md @@ -1,11 +1,11 @@ # Pattern 3: Helm Chart for deployment of a Simple Scalable Deployment of WSO2 API Manager -Resources for building a Helm chart for deployment of a [simple scalable deployment of WSO2 API Manager](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/deployment-overview/#simple-scalable-deployment). +Resources for building a Helm chart for deployment of a [simple scalable deployment of WSO2 API Manager](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/deployment-overview/#simple-scalable-deployment). -![WSO2 API Manager pattern 3 deployment](https://apim.docs.wso2.com/en/4.0.0/assets/img/setup-and-install/basic-scalable-deployment.png) +![WSO2 API Manager pattern 3 deployment](https://apim.docs.wso2.com/en/4.1.0/assets/img/setup-and-install/basic-scalable-deployment.png) For advanced details on the deployment pattern, please refer to the official -[documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/distributed-deployment/deploying-wso2-api-m-in-a-distributed-setup/). +[documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/distributed-deployment/deploying-wso2-api-m-in-a-distributed-setup/). ## Contents @@ -57,7 +57,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] Helm version 2 ``` - helm install --name wso2/am-pattern-3 --version 4.0.0-1 --namespace + helm install --name wso2/am-pattern-3 --version 4.1.0-1 --namespace ``` Helm version 3 @@ -65,7 +65,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] - Deploy the Kubernetes resources using the Helm Chart ``` - helm install wso2/am-pattern-3 --version 4.0.0-1 --namespace --create-namespace + helm install wso2/am-pattern-3 --version 4.1.0-1 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-pattern-3 --version 4.0.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -97,7 +97,7 @@ git clone https://github.com/wso2/kubernetes-apim.git Helm version 2 ``` - helm install --dep-up --name /am-pattern-3 --version 4.0.0-1 --namespace + helm install --dep-up --name /am-pattern-3 --version 4.1.0-1 --namespace ``` Helm version 3 @@ -105,7 +105,7 @@ git clone https://github.com/wso2/kubernetes-apim.git - Deploy the Kubernetes resources using the Helm Chart ``` - helm install /am-pattern-3 --version 4.0.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-3 --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -116,7 +116,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-pattern-3 --version 4.0.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-pattern-3 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` Or else, you can configure the default configurations inside the am-pattern-3 helm chart [values.yaml](https://github.com/wso2/kubernetes-apim/blob/master/advanced/am-pattern-3/values.yaml) file. Refer [this](https://helm.sh/docs/chart_template_guide/values_files/) for to learn more details about the `values.yaml` file. @@ -124,7 +124,7 @@ Or else, you can configure the default configurations inside the am-pattern-3 he > **Note:**
From the above Helm commands, base image of a Micro Integrator is deployed (without any integration solution). To deploy your integration solution with the Helm charts follow the below steps.

->1. [Create an integration service using WSO2 Integration Studio and expose it as a Managed API](https://apim.docs.wso2.com/en/4.0.0/tutorials/integration-tutorials/service-catalog-tutorial/#exposing-an-integration-service-as-a-managed-api). Then [create a Docker image](https://apim.docs.wso2.com/en/4.0.0/integrate/develop/create-docker-project/#creating-docker-exporter) and push it to your private or public Docker registry.

+>1. [Create an integration service using WSO2 Integration Studio and expose it as a Managed API](https://apim.docs.wso2.com/en/4.1.0/tutorials/integration-tutorials/service-catalog-tutorial/#exposing-an-integration-service-as-a-managed-api). Then [create a Docker image](https://apim.docs.wso2.com/en/4.1.0/integrate/develop/create-docker-project/#creating-docker-exporter) and push it to your private or public Docker registry.

- `INTEGRATION_IMAGE_REGISTRY` will refer to the Docker registry that created Docker image has been pushed
- `INTEGRATION_IMAGE_NAME` will refer to the name of the created Docker image
- `INTEGRATION_IMAGE_TAG` will refer to the tag of the created Docker image

@@ -132,25 +132,25 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-3 --version 4.0.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics -If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.0.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. +If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.1.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-3 --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-3 --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -247,7 +247,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `wso2.deployment.am.dockerRegistry` | Registry location of the Docker image to be used to create API Manager instances | - | | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | -| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.am.resources.requests.memory` | The minimum amount of memory that should be allocated for running API Manager product profiles with profile optimization | 1Gi | | `wso2.deployment.am.resources.requests.cpu` | The minimum amount of CPU that should be allocated for running API Manager product profiles with profile optimization | 1000m | @@ -286,7 +286,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `wso2.deployment.mi.dockerRegistry` | Registry location of the Docker image to be used to create Micro Integrator instances | - | | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | -| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | @@ -300,7 +300,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.mi.ingress.management.hostname` | Hostname for Micro Integrator management apis | `management.mi.wso2.com` | | `wso2.deployment.mi.ingress.management.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | -**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/install/installation-prerequisites/). +**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/install/installation-prerequisites/). ## Kubernetes Specific Configurations @@ -347,5 +347,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-3 --version 4.0.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-3 --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` diff --git a/advanced/am-pattern-4/README.md b/advanced/am-pattern-4/README.md index 7853c055..718eb71c 100644 --- a/advanced/am-pattern-4/README.md +++ b/advanced/am-pattern-4/README.md @@ -1,11 +1,11 @@ # Pattern 4: Helm Chart for Distributed API-M Deployment with Traffic Manager Separated from the Control Plane -Resources for building a Helm chart for deployment of a [simple scalable deployment of WSO2 API Manager](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/deployment-overview/#simple-scalable-deployment). +Resources for building a Helm chart for deployment of a [simple scalable deployment of WSO2 API Manager](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/deployment-overview/#simple-scalable-deployment). -![WSO2 API Manager pattern 4 deployment](https://apim.docs.wso2.com/en/4.0.0/assets/img/setup-and-install/deployment-tm.png) +![WSO2 API Manager pattern 4 deployment](https://apim.docs.wso2.com/en/4.1.0/assets/img/setup-and-install/deployment-tm.png) For advanced details on the deployment pattern, please refer to the official -[documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/distributed-deployment/deploying-wso2-api-m-in-a-distributed-setup/). +[documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/distributed-deployment/deploying-wso2-api-m-in-a-distributed-setup/). ## Contents @@ -57,7 +57,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] Helm version 2 ``` - helm install --name wso2/am-pattern-4 --version 4.0.0-2 --namespace + helm install --name wso2/am-pattern-4 --version 4.1.0-1 --namespace ``` Helm version 3 @@ -65,7 +65,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] - Deploy the Kubernetes resources using the Helm Chart ``` - helm install wso2/am-pattern-4 --version 4.0.0-2 --namespace --create-namespace + helm install wso2/am-pattern-4 --version 4.1.0-1 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-pattern-4 --version 4.0.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -124,7 +124,7 @@ Or else, you can configure the default configurations inside the am-pattern-4 he > **Note:**
From the above Helm commands, base image of a Micro Integrator is deployed (without any integration solution). To deploy your integration solution with the Helm charts follow the below steps.

->1. [Create an integration service using WSO2 Integration Studio and expose it as a Managed API](https://apim.docs.wso2.com/en/4.0.0/tutorials/integration-tutorials/service-catalog-tutorial/#exposing-an-integration-service-as-a-managed-api). Then [create a Docker image](https://apim.docs.wso2.com/en/4.0.0/integrate/develop/create-docker-project/#creating-docker-exporter) and push it to your private or public Docker registry.

+>1. [Create an integration service using WSO2 Integration Studio and expose it as a Managed API](https://apim.docs.wso2.com/en/4.1.0/tutorials/integration-tutorials/service-catalog-tutorial/#exposing-an-integration-service-as-a-managed-api). Then [create a Docker image](https://apim.docs.wso2.com/en/4.1.0/integrate/develop/create-docker-project/#creating-docker-exporter) and push it to your private or public Docker registry.

- `INTEGRATION_IMAGE_REGISTRY` will refer to the Docker registry that created Docker image has been pushed
- `INTEGRATION_IMAGE_NAME` will refer to the name of the created Docker image
- `INTEGRATION_IMAGE_TAG` will refer to the tag of the created Docker image

@@ -132,25 +132,25 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-4 --version 4.0.0-2 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics -If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.0.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. +If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.1.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-4 --version 4.0.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-4 --version 4.0.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -247,7 +247,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------|------------------------------------------------| | `wso2.deployment.am.dockerRegistry` | Registry location of the Docker image to be used to create API Manager instances | - | | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | -| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.am.resources.requests.memory` | The minimum amount of memory that should be allocated for running API Manager product profiles with profile optimization | 1Gi | | `wso2.deployment.am.resources.requests.cpu` | The minimum amount of CPU that should be allocated for running API Manager product profiles with profile optimization | 1000m | @@ -297,7 +297,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `wso2.deployment.mi.dockerRegistry` | Registry location of the Docker image to be used to create Micro Integrator instances | - | | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | -| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | @@ -311,7 +311,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.mi.ingress.management.hostname` | Hostname for Micro Integrator management apis | `management.mi.wso2.com` | | `wso2.deployment.mi.ingress.management.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | -**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/install/installation-prerequisites/). +**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/install/installation-prerequisites/). ## Kubernetes Specific Configurations @@ -359,5 +359,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-4 --version 4.0.0-2 --namespace --dependency-update --create-namespace + helm install /am-pattern-4 --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` diff --git a/simple/am-single/README.md b/simple/am-single/README.md index 89fd00f2..9699342e 100644 --- a/simple/am-single/README.md +++ b/simple/am-single/README.md @@ -1,11 +1,11 @@ # Helm Chart for deployment of WSO2 API Manager -Resources for building a Helm chart for deployment of [Single Node API Manager](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/single-node/all-in-one-deployment-overview/#single-node-deployment). +Resources for building a Helm chart for deployment of [Single Node API Manager](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/single-node/all-in-one-deployment-overview/#single-node-deployment). -![WSO2 API Manager Single Node deployment](https://apim.docs.wso2.com/en/4.0.0/assets/img/setup-and-install/single-node-apim-deployment.png) +![WSO2 API Manager Single Node deployment](https://apim.docs.wso2.com/en/4.1.0/assets/img/setup-and-install/single-node-apim-deployment.png) For advanced details on the deployment pattern, please refer to the official -[documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/setup/single-node/all-in-one-deployment-overview/#active-active-deployment). +[documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/setup/single-node/all-in-one-deployment-overview/#active-active-deployment). ## Contents @@ -57,7 +57,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] Helm version 2 ``` - helm install --name wso2/am-single-node --version 4.0.0-1 --namespace + helm install --name wso2/am-single-node --version 4.1.0-1 --namespace ``` Helm version 3 @@ -65,7 +65,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] - Deploy the Kubernetes resources using the Helm Chart ``` - helm install wso2/am-single-node --version 4.0.0-1 --namespace --create-namespace + helm install wso2/am-single-node --version 4.1.0-1 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-single-node --version 4.0.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-single-node --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -97,7 +97,7 @@ git clone https://github.com/wso2/kubernetes-apim.git Helm version 2 ``` - helm install --dep-up --name /am-single --version 4.0.0-1 --namespace + helm install --dep-up --name /am-single --version 4.1.0-1 --namespace ``` Helm version 3 @@ -105,7 +105,7 @@ git clone https://github.com/wso2/kubernetes-apim.git - Deploy the Kubernetes resources using the Helm Chart ``` - helm install /am-single --version 4.0.0-1 --namespace --dependency-update --create-namespace + helm install /am-single --version 4.1.0-1 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -116,24 +116,24 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-single --version 4.0.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-single --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` ### Choreo Analytics -If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.0.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. +If you need to enable Choreo Analytics with WSO2 API Manager, please follow the documentation on [Register for Analytics](https://apim.docs.wso2.com/en/4.1.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/) to obtain the on-prem key for Analytics. The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-single-node --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-single-node --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-single-node --version 4.0.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-single-node --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -225,7 +225,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters |-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|-----------------------------| | `wso2.deployment.am.dockerRegistry` | Registry location of the Docker image to be used to create API Manager instances | - | | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | -| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.0.0 | +| `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | | `wso2.deployment.am.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for API Manager node | 180 | | `wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager node | 10 | @@ -246,7 +246,7 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Gateway WebSub service | `gateway.am.wso2.com` | | `wso2.deployment.am.ingress.websub.annotations` | Ingress resource annotations for API Manager Gateway WebSub | Community NGINX Ingress controller annotations | -**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.0.0/install-and-setup/install/installation-prerequisites/). +**Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/install/installation-prerequisites/). ## Kubernetes Specific Configurations From 7797a67526a34288c2a800d2d9d1b8adc3c9a897 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Fri, 1 Apr 2022 14:49:45 +0530 Subject: [PATCH 12/15] Comment APIM throtteling policies in pattern 3 --- .../instance-1/wso2am-pattern-3-am-control-plane-conf.yaml | 6 +++--- .../instance-2/wso2am-pattern-3-am-control-plane-conf.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml index a8e35722..680582cd 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-conf.yaml @@ -163,9 +163,9 @@ data: [apim.throttling] event_duplicate_url = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-2-service:5672"] service_url = "https://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/" - enable_data_publishing = true - enable_policy_deploy = true - enable_blacklist_condition = true + #enable_data_publishing = true + #enable_policy_deploy = true + #enable_blacklist_condition = true #enable_persistence = true throttle_decision_endpoints = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-1-service:5672","tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-2-service:5672"] diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml index 0040f38c..dc196b85 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-conf.yaml @@ -164,9 +164,9 @@ data: [apim.throttling] event_duplicate_url = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-1-service:5672"] service_url = "https://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/" - enable_data_publishing = true - enable_policy_deploy = true - enable_blacklist_condition = true + #enable_data_publishing = true + #enable_policy_deploy = true + #enable_blacklist_condition = true #enable_persistence = true throttle_decision_endpoints = ["tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-1-service:5672","tcp://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-2-service:5672"] From 6056712b73f77b165c0d5e70935916c35e37dcfd Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Fri, 1 Apr 2022 14:51:01 +0530 Subject: [PATCH 13/15] Add missing APIM throtteling url group configs in pattern 4 --- .../instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml | 3 ++- .../instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml index 426fb30b..1655bcb7 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-conf.yaml @@ -97,7 +97,8 @@ data: [[apim.throttling.url_group]] traffic_manager_urls = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:9611"] traffic_manager_auth_urls = ["ssl://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:9711"] - + type = "loadbalance" + [[apim.throttling.url_group]] traffic_manager_urls = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-2-service:9611"] traffic_manager_auth_urls = ["ssl://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-2-service:9711"] diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml index 83f672d5..cbed1b6e 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml @@ -92,7 +92,7 @@ data: #enable_policy_deploy = true #enable_blacklist_condition = true #enable_persistence = true - #throttle_decision_endpoints = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:5672","tcp://localhost:5672"] + #throttle_decision_endpoints = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service:5672","tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-2-service:5672"] throttle_decision_endpoints = ["tcp://localhost:5672"] [[apim.throttling.url_group]] From 8b16d91677c6abb8dd95793990625f2fc71262c7 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Mon, 4 Apr 2022 21:33:53 +0530 Subject: [PATCH 14/15] Update pattern 3 volume claim configs --- .../wso2am-pattern-3-am-control-plane-volume-claims.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-volume-claims.yaml b/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-volume-claims.yaml index fe3ee17c..b7c0fb78 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-volume-claims.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/wso2am-pattern-3-am-control-plane-volume-claims.yaml @@ -1,3 +1,4 @@ +{{ if .Values.wso2.deployment.persistentRuntimeArtifacts.apacheSolrIndexing.enabled }} # Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,8 +26,6 @@ spec: storage: {{ .Values.wso2.deployment.persistentRuntimeArtifacts.apacheSolrIndexing.capacity.carbonDatabase }} storageClassName: {{ .Values.wso2.deployment.persistentRuntimeArtifacts.storageClass }} - {{ if .Values.wso2.deployment.persistentRuntimeArtifacts.apacheSolrIndexing.enabled }} - --- apiVersion: v1 From a9321161fe5456bea20d50a40aed9be452291702 Mon Sep 17 00:00:00 2001 From: Pasan Tennakoon Date: Mon, 11 Apr 2022 17:48:18 +0530 Subject: [PATCH 15/15] Update repository Readme --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 31c787a2..44e20f47 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,19 @@ * [Deployment Pattern 3](advanced/am-pattern-3/README.md) * [Deployment Pattern 4](advanced/am-pattern-4/README.md) +### Update the JWKS Endpoint + +The JWKS endpoint of the API Manager has the external facing hostname by default. This is not routable. To resolve this, you can alter the JWKS endpoint in the API Manager to use the API Manager's internal service name in Kubernetes. + +1. Log into Admin portal - https://am.wso2.com/admin/ +2. Navigate to Key Managers section and select the Resident Key Manager. +3. Change the JWKS URL in the Certificates section to https://:9443/oauth2/jwks. + + +### Update certificate domain names + +To verify connecting peers API Manager use wso2carbon certificate. By default this only allows peers from localhost domain to connect. To allow connections from different domains you need to create a certificate with the allowed domain name list and add it to API Manager keystores. This can be done by mounting a volume with the modified keystores. You can find the APIM Manager keystores inside the *~/wso2am-4.1.0/repository/resources/security/* directory. + ## Reporting issues We encourage you to report any issues and documentation faults regarding Kubernetes and Helm resources