Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2.0] Introduce Kubernetes and Helm Resources for WSO2 API Management Pattern 3 #439

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
30dfbc8
[3.2.0][Pattern-3] Update Helm chart metadata
chirangaalwis Aug 12, 2020
3485b3d
[3.2.0][Pattern-3] Update Helm chart dependencies
chirangaalwis Aug 12, 2020
793999f
[3.2.0][Pattern-3] Update user input values file
chirangaalwis Aug 12, 2020
7246076
[3.2.0][Pattern-3] Update Analytics Worker configurations
chirangaalwis Aug 12, 2020
cd0ba11
[3.2.0][Pattern-3] Add MySQL JDBC driver to Analytics Worker deployment
chirangaalwis Aug 12, 2020
b6731a9
[3.2.0][Pattern-3] Update APIM KM configurations
chirangaalwis Aug 12, 2020
9eba8c0
[3.2.0][Pattern-3] Add MySQL JDBC driver to APIM KM deployment
chirangaalwis Aug 12, 2020
b22d142
[3.2.0][Pattern-3] Move APIM KM deployment to a StatefulSet
chirangaalwis Aug 13, 2020
4d34597
[3.2.0][Pattern-3] Update APIM KM configurations based on RC-4
chirangaalwis Aug 13, 2020
79437e9
[3.2.0][Pattern-3] Update APIM TM configurations
chirangaalwis Aug 13, 2020
77cb656
[3.2.0][Pattern-3] Update APIM Publisher configurations
chirangaalwis Aug 13, 2020
f945707
[3.2.0][Pattern-3] Add MySQL JDBC driver to APIM Publisher deployment
chirangaalwis Aug 13, 2020
730a481
[3.2.0][Pattern-3] Update APIM DevPortal configurations
chirangaalwis Aug 13, 2020
d637f93
[3.2.0][Pattern-3] Add MySQL JDBC driver to APIM DevPortal deployment
chirangaalwis Aug 13, 2020
97cea12
[3.2.0][Pattern-3] Update APIM Gateway configurations
chirangaalwis Aug 13, 2020
48d7f86
[3.2.0][Pattern-3] Update APIM Gateway deployment
chirangaalwis Aug 13, 2020
d8aa93f
[3.2.0][Pattern-3] Update Analytics Dashboard configurations
chirangaalwis Aug 13, 2020
4b0d015
[3.2.0][Pattern-3] Add MySQL JDBC driver to Analytics Dashboard deplo…
chirangaalwis Aug 13, 2020
d4a0e47
[3.2.0][Pattern-3] Update APIM Publisher configurations
chirangaalwis Aug 13, 2020
37598b9
[3.2.0][Pattern-3] Update APIM configurations
chirangaalwis Aug 14, 2020
a6fffbc
[3.2.0][Pattern-3] Override APIM TM entrypoint to set event duplicate…
chirangaalwis Aug 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions advanced/am-pattern-3/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.

apiVersion: v1
appVersion: "3.1.0"
appVersion: "3.2.0"
description: A Helm chart for the deployment of WSO2 API Management deployment pattern 3
name: am-pattern-3
version: 3.1.0-3
version: 3.2.0-1
icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg
3 changes: 2 additions & 1 deletion advanced/am-pattern-3/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

dependencies:
- name: mysql-am
version: "3.1.0-3"
version: "3.2.0-1"
repository: "https://helm.wso2.com"
condition: wso2.deployment.dependencies.mysql
- name: nfs-server-provisioner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,12 @@ data:
ssoEnabled: true
properties:
adminScope: apim_analytics:admin_carbon.super
allScopes: apim_analytics:admin apim_analytics:product_manager apim_analytics:api_developer apim_analytics:app_developer apim_analytics:devops_engineer apim_analytics:analytics_viewer apim_analytics:everyone openid apim:api_view apim:subscribe
allScopes: apim_analytics:admin openid apim:api_view apim:subscribe apim_analytics:monitoring_dashboard:own apim_analytics:monitoring_dashboard:edit apim_analytics:monitoring_dashboard:view apim_analytics:business_analytics:own apim_analytics:business_analytics:edit apim_analytics:business_analytics:view apim_analytics:api_analytics:own apim_analytics:api_analytics:edit apim_analytics:api_analytics:view apim_analytics:application_analytics:own apim_analytics:application_analytics:edit apim_analytics:application_analytics:view
adminUsername: admin
adminPassword: admin
kmDcrUrl: https://{{ template "am-pattern-3.resource.prefix" . }}-am-publisher-service:9443/client-registration/v0.16/register
kmDcrUrl: https://{{ template "am-pattern-3.resource.prefix" . }}-am-publisher-service:9443/client-registration/v0.17/register
kmTokenUrlForRedirection: https://{{ .Values.wso2.deployment.am.publisher.hostname }}/oauth2
kmTokenUrl: https://{{ template "am-pattern-3.resource.prefix" . }}-km-service:9443/oauth2
kmTokenUrl: https://{{ template "am-pattern-3.resource.prefix" . }}-am-publisher-service:9443/oauth2
kmUsername: admin
kmPassword: admin
portalAppContext: analytics-dashboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,26 @@ spec:
initContainers:
{{- if .Values.wso2.deployment.dependencies.mysql }}
- name: init-mysql-db
image: busybox:1.31
image: busybox:1.32
command: ['sh', '-c', 'echo -e "Checking for the availability of DBMS service"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> DBMS service is available";']
- name: init-mysql-connector-download
image: busybox:1.32
command:
- /bin/sh
- "-c"
- |
set -e
connector_version=8.0.17
wget https://repo1.maven.org/maven2/mysql/mysql-connector-java/${connector_version}/mysql-connector-java-${connector_version}.jar -P /mysql-connector-jar/
volumeMounts:
- name: mysql-connector-jar
mountPath: /mysql-connector-jar
{{- end }}
- name: init-am-publisher
image: busybox:1.31
image: busybox:1.32
command: ['sh', '-c', 'echo -e "Checking for the availability of API Manager Publisher deployment"; while ! nc -z {{ template "am-pattern-3.resource.prefix" . }}-am-publisher-service 9443; do sleep 1; printf "-"; done; echo -e " >> API Manager Publisher service has started";']
- name: init-am-devportal
image: busybox:1.31
image: busybox:1.32
command: ['sh', '-c', 'echo -e "Checking for the availability of API Manager DevPortal deployment"; while ! nc -z {{ template "am-pattern-3.resource.prefix" . }}-am-devportal-service 9443; do sleep 1; printf "-"; done; echo -e " >> API Manager DevPortal service has started";']
containers:
- name: wso2am-analytics-dashboard
Expand Down Expand Up @@ -94,6 +106,10 @@ spec:
- name: wso2am-analytics-dashboard-conf
mountPath: /home/wso2carbon/wso2-config-volume/conf/dashboard/deployment.yaml
subPath: deployment.yaml
{{ if .Values.wso2.deployment.dependencies.mysql }}
- name: mysql-connector-jar
mountPath: /home/wso2carbon/wso2-artifact-volume/lib
{{ end }}
serviceAccountName: {{ .Values.kubernetes.serviceAccount }}
{{- if .Values.wso2.deployment.analytics.dashboard.imagePullSecrets }}
imagePullSecrets:
Expand All @@ -106,3 +122,7 @@ spec:
- name: wso2am-analytics-dashboard-conf
configMap:
name: {{ template "am-pattern-3.resource.prefix" . }}-am-analytics-dashboard-conf
{{ if .Values.wso2.deployment.dependencies.mysql }}
- name: mysql-connector-jar
emptyDir: {}
{{ end }}
Loading