Update master Mon Jun 18 04:50:46 UTC 2018 (#1010)

IBM · Jun 18, 2018 · 4416f13 · 4416f13
1 parent 2c07a19
commit 4416f13
Show file tree

Hide file tree

Showing 16 changed files with 197 additions and 59 deletions.
diff --git a/repo/stable/ibm-db2oltp-dev-3.0.0.tgz b/repo/stable/ibm-db2oltp-dev-3.0.0.tgz
diff --git a/repo/stable/ibm-istio-0.7.1.tgz b/repo/stable/ibm-istio-0.7.1.tgz
diff --git a/repo/stable/ibm-microclimate-1.2.1.tgz b/repo/stable/ibm-microclimate-1.2.1.tgz
diff --git a/repo/stable/index.yaml b/repo/stable/index.yaml
@@ -193,6 +193,32 @@ entries:
     - https://raw.githubusercontent.com/IBM/charts/master/repo/stable/ibm-datapower-dev-0.1.0.tgz
     version: 0.1.0
   ibm-db2oltp-dev:
+  - apiVersion: v1
+    created: 2018-06-18T04:50:46.262805749Z
+    description: IBM Db2 Developer-C Edition 11.1.3.3
+    digest: d0e7ae6f36ca890663ff778ca288a565a72bd274f5c62c38551e0c2775e4454b
+    engine: gotpl
+    home: https://www.ibm.com/analytics/us/en/db2/
+    icon: https://raw.githubusercontent.com/IBM/charts/master/logo/db2logoicp-01.png
+    keywords:
+    - db2
+    - database
+    - sql
+    - amd64
+    - ppc64le
+    - s390x
+    - Limited
+    - ICP
+    - IKS
+    maintainers:
+    - name: IBM Analytics
+    name: ibm-db2oltp-dev
+    sources:
+    - https://github.com/IBM/charts/tree/master/stable
+    tillerVersion: '>=2.6.0'
+    urls:
+    - https://raw.githubusercontent.com/IBM/charts/master/repo/stable/ibm-db2oltp-dev-3.0.0.tgz
+    version: 3.0.0
   - apiVersion: v1
     created: 2018-03-17T01:04:50.517226026Z
     description: IBM Db2 Developer-C Edition 11.1.3.3
@@ -1299,9 +1325,9 @@ entries:
     version: 0.1.0
   ibm-istio:
   - apiVersion: v1
-    created: 2018-06-14T03:23:41.83947812Z
+    created: 2018-06-18T04:50:46.26615267Z
     description: Helm chart for all istio components
-    digest: f0ea76236a0ef16491c70f7ce6107f457d0aabeefaaa539ff21f2854a428f61a
+    digest: 57cb25e2a502428b92e828f69c7714fb7a0c8def42518286d0be56f66e4c2846
     icon: https://raw.githubusercontent.com/IBM/charts/master/logo/istio-logo.png
     keywords:
     - istio
@@ -1444,10 +1470,10 @@ entries:
     version: 1.0.0
   ibm-microclimate:
   - appVersion: "18.05"
-    created: 2018-06-14T03:23:41.843248716Z
+    created: 2018-06-18T04:50:46.27176109Z
     description: End to end development environment for rapidly creating, developing
       and deploying applications.
-    digest: 998b70dbe0160e5c57a19cb115fa52eed4386e79670cb77584a789da522a3788
+    digest: 0147c86f098338a3f4e4a717b4de158f5d9585bdbe4614f908e7ea73e7367a1c
     keywords:
     - Microclimate
     - Microservice
@@ -2771,4 +2797,4 @@ entries:
     urls:
     - https://raw.githubusercontent.com/IBM/charts/master/repo/stable/ibm-webterminal-dev-1.0.0.tgz
     version: 1.0.0
-generated: 2018-06-14T03:23:41.834993735Z
+generated: 2018-06-18T04:50:46.254879446Z
diff --git a/stable/ibm-db2oltp-dev/Chart.yaml b/stable/ibm-db2oltp-dev/Chart.yaml
@@ -1,11 +1,17 @@
 apiVersion: v1
 name: ibm-db2oltp-dev
 description: IBM Db2 Developer-C Edition 11.1.3.3
-version: 2.0.0
+version: 3.0.0
 keywords:
 - db2
 - database
 - sql
+- amd64
+- ppc64le
+- s390x
+- Limited
+- ICP
+- IKS
 home: https://www.ibm.com/analytics/us/en/db2/
 icon: https://raw.githubusercontent.com/IBM/charts/master/logo/db2logoicp-01.png
 maintainers:

diff --git a/stable/ibm-db2oltp-dev/README.md b/stable/ibm-db2oltp-dev/README.md
@@ -119,15 +119,15 @@ helm repo add ibm-charts https://raw.githubusercontent.com/IBM/charts/master/rep
 helm search <repo>
 
 #Finally install the respective chart
-$ helm install --name my-release local/ibm-db2oltp-dev:2.0.0
+$ helm install --name my-release local/ibm-db2oltp-dev:3.0.0
 ```
 
 The command deploys ibm-db2oltp-dev on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
 ## Configuration
 
 You may change the default of each parameter using the `--set key=value[,key=value]`.
-I.e `helm install --name my-release --set global.image.secretname=<secretname> local/ibm-db2oltp-dev:2.0.0`
+I.e `helm install --name my-release --set global.image.secretName=<secretname> local/ibm-db2oltp-dev:3.0.0`
 
 > **Tip**: You can configure the default [values.yaml](values.yaml)
 
@@ -139,7 +139,7 @@ The following tables lists the configurable parameters of the ibm-db2oltp-dev ch
 | `global.image.secretName`           | Docker Store registry secret                        | `nil` - Enter a generated secret name as explained above or patch default serviceaccount | 
 | `arch`                              | Worker node architecture                            | `nil` - will try to detect it automatically based on the node deploying the chart. Or user can choose either amd64, s390x, or ppc64le | 
 | `imageRepository`                   | Db2 Developer-C Edition image repository            | `store/ibmcorp/db2_developer_c`                                                 |     
-| `imageTag`                          | Db2 Developer-C Edition image tag                   | `11.1.3.3` - will be suffixed with `-<arch>` once architecture is determined    |
+| `imageTag`                          | Db2 Developer-C Edition image tag                   | `11.1.3.3a` - will be suffixed with `-<arch>` once architecture is determined    |
 | `imagePullPolicy`                   | Image pull policy                                   | `IfNotPresent`                                                                  |
 | `service.name`                      | The name of the Service                             | `ibm-db2oltp-dev`                                                               |
 | `service.port`                      | TCP port                                            | `50000`                                                                         |
@@ -212,7 +212,7 @@ Db2 HADR on a kubernetes cluster is currently supported to be deployed within th
   * Additional configuration options for these volumes are available in the table above - such as size, name, existing claim names, and storage class names.  
 - Once Db2 HADR has been enabled, the install will kick off 2 replicas of the ibm-db2oltp-dev statefulset. Each pod in this set will be configured as a PRIMARY and a STANDBY database. The PRIMARY will be configured on ibm-db2oltp-dev-0 pod and STANDBY on the ibm-db2oltp-dev-1 pod. If takeover happens, the PRIMARY will get switched to the ibm-db2oltp-dev-1 pod and when STANDBY is restarted, it will be set up on the ibm-db2oltp-dev-0. This will get switched as roles change during takeovers. 
 - An automatic client re-route [ACR](https://www.ibm.com/support/knowledgecenter/en/SSEPGG_11.1.0/com.ibm.db2.luw.admin.ha.doc/doc/c0011976.html) is set up on each primary and standby pods so that applications can be directed to a standby server if a primary crash occurs. 
-- Refer to the Db2 on ICP recipe for how to connect to your primary database - [here](https://developer.ibm.com/recipes/tutorials/db2-integration-into-ibm-cloud-private/)
+- Refer to the Db2 integration recipe for how to connect to your primary database - [here](https://developer.ibm.com/recipes/tutorials/db2-integration-into-ibm-cloud-private/)
 
 
 ## Architecture
@@ -224,6 +224,13 @@ Db2 HADR on a kubernetes cluster is currently supported to be deployed within th
 
 An `arch` field in values.yaml is recommended in order to guarantee that the chart has chosen the right architecture to deploy to and the right tagged container is pulled. If left blank, the chart will determine the architecture based on the master node architecture. 
 
+## Retrieving the Db2 instance password
+
+The Db2 instance password is either auto-generated to a 10 character random password or user-specified. To retrieve the Db2 instance password, the user can execute the following command, where <SECRET NAME> is the secret for the statefulset as retrieved by `kubectl get secrets`:
+
+`kubectl get secret --namespace default <SECRET NAME> -o jsonpath="{.data.password}" | base64 --decode; echo`
+
+The command will output the decoded secret. 
 
 ## Persistence
 

diff --git a/stable/ibm-db2oltp-dev/RELEASENOTES.md b/stable/ibm-db2oltp-dev/RELEASENOTES.md
@@ -0,0 +1,35 @@
+# What’s new in Db2 Developer-C Chart Version 3.0.0
+
+ROLLING UPGRADES FROM PREVIOUS CHART RELEASES ARE NOT SUPPORTED
+
+With Db2 Developer-C Edition on Chart Version 3.0.0, the following new
+features are available:
+
+* Update to the latest version of Db2 - 11.1.3.3 iFix001- [Mod Pack and Fix Pack Updates](https://www.ibm.com/support/knowledgecenter/en/SSEPGG_11.1.0/com.ibm.db2.luw.wn.doc/doc/c0061179.html)
+* Chart upgrades starting with version 3.0.1 .
+* Out of the box configuration for [Db2 HADR](https://www.ibm.com/support/knowledgecenter/en/SSEPGG_11.1.0/com.ibm.db2.luw.admin.ha.doc/doc/c0011267.html)
+  - Currently configurable as HA only (within the same Data Center)
+
+# Fixes
+* Latest Db2 code base (11.1.3.3 iFix001)
+
+# Prerequisites
+1. Kubernetes version >= 1.8.3.
+2. Three persistent volumes are required if dynamic provision is not available. 
+3. IBM Cloud Private version >= 2.1.0.1
+
+# Version History
+
+| Chart | Date        | Kubernetes Required | Image(s) Supported         | Details                                                             |
+| ----- | ----------- | ------------------- | -------------------------- | ------------------------------------------------------------------- | 
+| 3.0.0 | Jun 22, 2018| >= 1.8.3            | db2_developer_c:11.1.3.3a  | Update to 11.1.3.3 iFix001                                          |
+| 2.0.1 | Apr 18, 2018| >= 1.8.3            | db2_developer_c:11.1.3.3x  | Fix for db2support issue - http://www-01.ibm.com/support/docview.wss?uid=swg22015393 |
+| 2.0.0 | Mar 14, 2018| >= 1.8.3            | db2_developer_c:11.1.3.3   | Support for Db2 HADR feature (single data center only) |
+| 1.1.3 | Feb 23, 2018| >= 1.8.3            | db2_developer_c:11.1.2.2b  | Migration to Docker Store hosting |
+| 1.1.2 | Feb 23, 2018| >= 1.8.3            | db2server_dec: 11.1.2.2b   | Architecture preferences on install and values metadata. Deprecated version |
+| 1.1.1 | Jan 25, 2018| >= 1.8.3            | db2server_dec: 11.1.2.2b   | iFix 002 for Db2 11.1.2.2 |
+| 1.1.0 | Nov 30, 2017| >= 1.7.3            | db2server_dec: 11.1.2.2a   | Multi-platform support and base OS security fixes |
+| 1.0.0 | Oct 24, 2017| >= 1.7.3            | db2server_dec: 11.1.2.2a   | iFix 001 for Db2 11.1.2.2 |
+| 0.1.1 | Oct 24, 2017| >= 1.7.3            | db2server_dec: 11.1.2.2    | Chart fixes |
+| 0.1.0 | Oct 24, 2017| >= 1.7.3            | db2server_dec: 11.1.2.2    | Db2 11.1.2.2 |
+
diff --git a/stable/ibm-db2oltp-dev/ReleaseNotes.md b/stable/ibm-db2oltp-dev/ReleaseNotes.md
diff --git a/stable/ibm-db2oltp-dev/charts/ibm-sch-1.2.1.tgz b/stable/ibm-db2oltp-dev/charts/ibm-sch-1.2.1.tgz
diff --git a/stable/ibm-db2oltp-dev/requirements.yaml b/stable/ibm-db2oltp-dev/requirements.yaml
@@ -0,0 +1,6 @@
+dependencies:
+  - name: ibm-sch
+    repository: "@sch" ## where sch is based on [NAME] from the cmd: helm repo add [flags] [NAME] [URL]
+    version: 1.2.1   
+    alias: sch
+
diff --git a/stable/ibm-db2oltp-dev/templates/_sch-chart-config.tpl b/stable/ibm-db2oltp-dev/templates/_sch-chart-config.tpl
@@ -0,0 +1,18 @@
+{{- /*
+"sch.chart.config.values" contains the chart specific values used to override or provide
+additional configuration values used by the Shared Configurable Helpers.
+*/ -}}
+{{- define "db2oltp.sch.chart.config.values" -}}
+sch:
+  chart:
+    appName: db2oltp
+    components: 
+      db2:
+        name: "db2"
+      etcd:
+        name: "etcd"
+    metering:
+      productName: "Db2 Developer-C Edition"
+      productID: "IBMDb2DeveloperCEdition_11133_dev_00000"
+      productVersion: "11.1.3.3"        
+{{- end -}}
diff --git a/stable/ibm-db2oltp-dev/templates/db2-service.yaml b/stable/ibm-db2oltp-dev/templates/db2-service.yaml
@@ -21,4 +21,5 @@ spec:
     name: {{ .Values.service.name }}-text
   selector:
     app: {{ template "fullname" . }}
+    component: "db2"
 
diff --git a/stable/ibm-db2oltp-dev/templates/db2-statefulset.yaml b/stable/ibm-db2oltp-dev/templates/db2-statefulset.yaml
@@ -1,10 +1,11 @@
+{{- include "sch.config.init" (list . "db2oltp.sch.chart.config.values") -}}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}"
     component: "db2"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -29,30 +30,54 @@ spec:
   clusterIP: None
   selector:
     app: {{ template "fullname" . }}
+    component: "db2"
 ---
 
+{{- if .Capabilities.APIVersions.Has "apps/v1beta2" }}
+apiVersion: apps/v1beta2
+{{- else }}
 apiVersion: apps/v1beta1
+{{- end }}
 kind: StatefulSet
 metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}"
     component: "db2"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
+      release: {{ .Release.Name }}
+      heritage: {{ .Release.Service }}
+      component: "db2"
   serviceName: {{ template "fullname" . }}
 {{- if .Values.hadr.enabled }}  
+  podManagementPolicy: "Parallel"
   replicas: 2
 {{- else }}
   replicas: 1
 {{- end }}
+  {{- if and (.Capabilities.KubeVersion.Major | hasPrefix "1") (.Capabilities.KubeVersion.Minor | hasPrefix "7") }}
+  # Set updateStrategy to "RollingUpdate", if we're on Kubernetes 1.7.
+  # It's already the default for apps/v1beta2 (Kubernetes 1.8 onwards)
+  updateStrategy:
+    type: OnDelete
+  {{- end }}
   template:
     metadata:
       name: {{ template "fullname" . }}
       labels:
         app: {{ template "fullname" . }}
+        chart: "{{ .Chart.Name }}"
+        component: "db2"
+        release: "{{ .Release.Name }}"
+        heritage: "{{ .Release.Service }}"
+      annotations:
+        {{- include "sch.metadata.annotations.metering" (list . .sch.chart.metering) | indent 8 }}
     spec:
       affinity:
         nodeAffinity:
@@ -112,16 +137,9 @@ spec:
       - name: {{ template "fullname" . }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}{{ template "platform" . }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-      {{- if .Values.hadr.enabled }}
-        securityContext:
-          privileged: true
-          capabilities:
-            add: ["SYS_RESOURCE", "IPC_OWNER", "SYS_NICE"]
-      {{- else }} 
         securityContext:
           capabilities:
             add: ["SYS_RESOURCE", "IPC_OWNER", "SYS_NICE"]
-      {{- end }}
         ports:
         - containerPort: 50000
         - containerPort: 55000
@@ -158,7 +176,6 @@ spec:
           value: "false"
         - name: HADR_ENABLED
           value: "{{ .Values.hadr.enabled }}"
-      {{- if not .Values.hadr.enabled }}  
         # set liveness probe to determine if container needs to be restarted
         # - command, http, or tcp
         # ref : https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
@@ -167,20 +184,27 @@ spec:
             command:
             - sh
             - -c
-            - /database/config/$DB2INSTANCE/sqllib/bin/db2gcf -s
+            - su - $DB2INSTANCE  -c '/database/config/$DB2INSTANCE/sqllib/bin/db2gcf -s'
+        {{- if not .Values.hadr.enabled }}
           initialDelaySeconds: 810
+        {{- else }}
+          initialDelaySeconds: 1620
+        {{- end }}
           periodSeconds: 90
           failureThreshold: 3 
         readinessProbe:
           exec:
             command:
             - sh
             - -c
-            - /database/config/$DB2INSTANCE/sqllib/bin/db2gcf -s
+            - su - $DB2INSTANCE  -c '/database/config/$DB2INSTANCE/sqllib/bin/db2gcf -s'
+        {{- if not .Values.hadr.enabled }}
           initialDelaySeconds: 60
+        {{- else }}
+          initialDelaySeconds: 360
+        {{- end }}
           periodSeconds: 30
-          failureThreshold: 25
-      {{- end }}
+          failureThreshold: 50
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         volumeMounts:
@@ -227,3 +251,4 @@ spec:
 
 
 
+