May 2020 release drop

merative · May 22, 2020 · ae0272a · ae0272a
1 parent 11f72e7
commit ae0272a
Show file tree

Hide file tree

Showing 35 changed files with 682 additions and 19,813 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,4 @@ yarn-error.log
 .pnp.js
 # Yarn Integrity file
 .yarn-integrity
+package-lock.json
diff --git a/.markdownlintignore b/.markdownlintignore
@@ -0,0 +1,2 @@
+src/pages/index.mdx
+node_modules/
diff --git a/.travis.yml b/.travis.yml
@@ -10,16 +10,26 @@ install:
   - npm install
 
 script:
-  - markdownlint **/*.mdx --ignore src/pages/index.mdx
+  - markdownlint **/*.mdx
   - gatsby build --prefix-paths
 
 deploy:
   - provider: pages
     skip_cleanup: true
     local_dir: public
     github_token: $GITHUB_TOKEN
-    github_url: github.com
+    github_url: github.ibm.com
     committer_from_gh: true
     target_branch: gh-pages
     on:
       branch: master
+  - provider: pages
+    skip_cleanup: true
+    local_dir: public
+    repo: wh-curamspm-devops/vnext-assets
+    github_token: $GITHUB_TOKEN
+    github_url: github.ibm.com
+    committer_from_gh: true
+    target_branch: master
+    on:
+      branch: next-release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,22 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## v20.5.0 Changes
+
+### Changes by kind
+
+#### Defects/Issues
+
+* [helm commands not working.](https://github.com/IBM/spm-kubernetes/issues/6)
+* [ChartMuseum links broken.](https://github.com/IBM/spm-kubernetes/issues/7)
+* [Documentation correction for license check.](https://github.com/IBM/spm-kubernetes/issues/10)
+* [Helm dependency for ce-app needs conditional adding.](https://github.com/IBM/spm-kubernetes/issues/13)
+* [CE Ingress controller Rules created when the Application isn't deployed.](https://github.com/IBM/spm-kubernetes/issues/14)
+* [Duplicate ihs elements in spm/values.yaml.](https://github.com/IBM/spm-kubernetes/issues/15)
+* Addition of heapSize parameter in batch chart to allow for custom heap size specification.
+
+
+#### Other
+
+* Document how to build and push images to IBM Cloud Container Registry.
+* Add documentation on repositories, runbook URLS, and release process.
diff --git a/helm-charts/batch/Chart.yaml b/helm-charts/batch/Chart.yaml
@@ -16,7 +16,7 @@
 apiVersion: v1
 name: batch
 description: Batch Chart for SPM Batch within a Kubernetes Cluster
-version: 1.1.1
+version: 1.2.0
 maintainers:
   - name: Cúram SPM Dev Team
     url: https://github.com/IBM/spm-kubernetes

diff --git a/helm-charts/batch/templates/_helpers.tpl b/helm-charts/batch/templates/_helpers.tpl
@@ -61,6 +61,18 @@ Build up full image path
 batch:{{- .imageTag -}}
 {{- end -}}
 
+{{/*
+Build up Ant Options for general and JMS Stats configuration
+*/}}
+{{- define "antOpts" }}
+{{- if ($.Values.global.batch.javaMetrics) ($.Values.global.batch.javaMetrics.antOpts) -}}
+{{- $.Values.global.batch.javaMetrics.antOpts -}}
+{{- end }}
+{{- if ($.Values.global.batch.javaMetrics) ($.Values.global.batch.javaMetrics.heapSize) -}}
+{{- $.Values.global.batch.javaMetrics.heapSize -}}
+{{- end }}
+{{- end }}
+
 {{/*
 Common labels
 */}}

diff --git a/helm-charts/batch/values.yaml b/helm-charts/batch/values.yaml
@@ -44,6 +44,7 @@ global:
     programParameters: ""
     # javaMetrics:
     #   antOpts: "-Xgcpolicy:gencon -Xverbosegclog:/tmp/GCLogs_chunker.log"
+    #   heapSize: "-Xms512m -Xmx512m"
     #   timer: "-Dcuram.jmx.output_statistics_timer_enabled=true"
     #   timerFolder: "-Dcuram.jmx.output_statistics_timer_folder=/tmp"
     #   timerPeriod: "-Dcuram.jmx.output_statistics_timer_period=60000"
diff --git a/helm-charts/ce-app/Chart.yaml b/helm-charts/ce-app/Chart.yaml
@@ -17,7 +17,7 @@
 apiVersion: v1
 name: ce-app
 description: Helm Chart for deploying the Universal Access React application
-version: 1.0.0
+version: 1.1.0
 maintainers:
   - name: Cúram SPM Dev Team
     url: https://github.com/IBM/spm-kubernetes

diff --git a/helm-charts/ce-app/templates/deployment.yaml b/helm-charts/ce-app/templates/deployment.yaml
@@ -1,4 +1,5 @@
 {{- with .Values.global.ceApp }}
+{{- if .imageName }}
 ---
 ###############################################################################
 # Copyright 2019,2020 IBM Corporation
@@ -85,4 +86,5 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+{{- end }}
 {{- end }}
diff --git a/helm-charts/ce-app/templates/service.yaml b/helm-charts/ce-app/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.global.ceApp.imageName }}
 ---
 ###############################################################################
 # Copyright 2019,2020 IBM Corporation
@@ -32,3 +33,4 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "ce-app.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/helm-charts/ce-app/values.yaml b/helm-charts/ce-app/values.yaml
@@ -18,7 +18,7 @@ global:
   ceApp:
     replicaCount: 1
     imageLibrary: ''
-    imageName: ce-ihs
+    imageName: ''
     imageTag: latest
     ingressPath: /universal
     readinessPath: /universal

diff --git a/helm-charts/spm/Chart.yaml b/helm-charts/spm/Chart.yaml
@@ -16,7 +16,7 @@
 apiVersion: v1
 name: spm
 description: Umbrella Helm Chart for Full Curam Deployment of SPM within a Kubernetes Cluster
-version: 1.2.0
+version: 1.3.0
 maintainers:
   - name: Cúram SPM Dev Team
     url: https://github.com/IBM/spm-kubernetes

diff --git a/helm-charts/spm/templates/ingress.yaml b/helm-charts/spm/templates/ingress.yaml
@@ -55,7 +55,7 @@ spec:
               servicePort: {{ $.Values.global.apps.common.port }}
           {{- end }}
           {{- end }}
-          {{- if .Values.global.ceApp.imageTag }}
+          {{- if .Values.global.ceApp.imageName }}
           - path: {{ .Values.global.ceApp.ingressPath | default "/universal" }}
             backend:
               serviceName: {{ $.Release.Name }}-ce-app

diff --git a/helm-charts/spm/values.yaml b/helm-charts/spm/values.yaml
@@ -15,6 +15,9 @@
 ###############################################################################
 
 global:
+  batch:
+    javaMetrics:
+      heapSize: "-Xms512m -Xmx512m"
   images:
     registry: &imageRegistry us.icr.io
     imageLibrary: ''
@@ -26,16 +29,17 @@ global:
   ceApp:
     replicaCount: 1
     imageLibrary: ''
-    imageName: ce-ihs
+    imageName: ''
     imageTag: latest
     ingressPath: /universal
     resources: {}
   ihs:
+    serviceType: NodePort
     runAs: 1000
     replicaCount: 1
+    resources: {}
     readinessPath: /CuramStatic
     ingressPath: /CuramStatic
-    resources: {}
   database:
     ## Database connection configuration
     # The property wlp_psw: contains the XOR password injected in the Liberty  configuration
@@ -230,11 +234,6 @@ global:
           limits:
             cpu: 0.75
             memory: 1Gi
-  ihs:
-    serviceType: NodePort
-    config:
-      readinessPath: /CuramStatic
-      ingressPath: /CuramStatic
   openldap:
     enabled: false
     identityOnly: false