Update master Tue Mar 6 04:30:17 UTC 2018 (IBM#591)

vmorris · Mar 6, 2018 · f09349a · f09349a
1 parent 8922bc3
commit f09349a
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-The `IBM/charts` repository provides [helm](https://github.com/kubernetes/helm) charts for IBM and Third Party middleware. 
+The `IBM/charts` repository provides [helm](https://github.com/kubernetes/helm) charts provided by IBM. 
 
 The repository is organized as follows:
 

diff --git a/repo/stable/ibm-db2oltp-dev-1.1.3.tgz b/repo/stable/ibm-db2oltp-dev-1.1.3.tgz
diff --git a/repo/stable/ibm-swift-sample-1.1.0.tgz b/repo/stable/ibm-swift-sample-1.1.0.tgz
diff --git a/repo/stable/index.yaml b/repo/stable/index.yaml
@@ -175,12 +175,12 @@ entries:
     version: 0.1.0
   ibm-db2oltp-dev:
   - apiVersion: v1
-    created: 2018-02-23T05:44:39.155283959Z
+    created: 2018-03-06T04:30:17.465498122Z
     description: IBM Db2 Developer-C Edition 11.1.2.2 iFix002
-    digest: bfba478778d0411826be5e2ab9d9fd3ac6c668aaed1fed726c958e0d8cf8ed12
+    digest: e9fed9b870f3931857be080ab108abe843bfeaa1c1ef93cc80457b6ec0a32ea4
     engine: gotpl
     home: https://www.ibm.com/analytics/us/en/db2/
-    icon: https://raw.githubusercontent.com/IBMPrivateCloud/charts/master/logo/db2logoicp-01.png
+    icon: https://raw.githubusercontent.com/IBM/charts/master/logo/db2logoicp-01.png
     keywords:
     - db2
     - database
@@ -1628,6 +1628,16 @@ entries:
     - https://raw.githubusercontent.com/IBM/charts/master/repo/stable/ibm-spectrum-symphony-1.0.0.tgz
     version: 1.0.0
   ibm-swift-sample:
+  - apiVersion: v1
+    created: 2018-03-06T04:30:17.466094845Z
+    description: A Swift sample application.
+    digest: a9f74a93036797d327ef1f5e248928222b814cc06eab9625321558e68c0a83d8
+    icon: https://raw.githubusercontent.com/IBM-Swift/kitura.io/master/assets/appIcon%402x.png
+    name: ibm-swift-sample
+    tillerVersion: '>=2.6.0'
+    urls:
+    - https://raw.githubusercontent.com/IBM/charts/master/repo/stable/ibm-swift-sample-1.1.0.tgz
+    version: 1.1.0
   - apiVersion: v1
     created: 2018-03-01T23:35:55.582793487Z
     description: A Swift sample application.
@@ -1780,4 +1790,4 @@ entries:
     urls:
     - https://raw.githubusercontent.com/IBM/charts/master/repo/stable/ibm-websphere-liberty-1.0.0.tgz
     version: 1.0.0
-generated: 2018-03-01T23:35:55.581934718Z
+generated: 2018-03-06T04:30:17.453678699Z
diff --git a/stable/ibm-db2oltp-dev/Chart.yaml b/stable/ibm-db2oltp-dev/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
 - database
 - sql
 home: https://www.ibm.com/analytics/us/en/db2/
-icon: https://raw.githubusercontent.com/IBMPrivateCloud/charts/master/logo/db2logoicp-01.png
+icon: https://raw.githubusercontent.com/IBM/charts/master/logo/db2logoicp-01.png
 maintainers:
   - name: IBM Analytics
 sources:

diff --git a/stable/ibm-swift-sample/.helmignore b/stable/ibm-swift-sample/.helmignore
@@ -0,0 +1,7 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+.git/
+.gitignore
+cv-tests/
diff --git a/stable/ibm-swift-sample/Chart.yaml b/stable/ibm-swift-sample/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 description: A Swift sample application.
 name: ibm-swift-sample
-version: 1.0.0
+version: 1.1.0
 icon: https://raw.githubusercontent.com/IBM-Swift/kitura.io/master/assets/appIcon%402x.png
 tillerVersion: ">=2.6.0"
diff --git a/stable/ibm-swift-sample/templates/_affinity.tpl b/stable/ibm-swift-sample/templates/_affinity.tpl
@@ -0,0 +1,44 @@
+{{/* affinity - https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ */}}
+
+{{- define "nodeaffinity" }}
+#https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    {{- include "nodeAffinityRequiredDuringScheduling" . }}
+    preferredDuringSchedulingIgnoredDuringExecution:
+    {{- include "nodeAffinityPreferredDuringScheduling" . }}
+{{- end }}
+
+{{- define "nodeAffinityRequiredDuringScheduling" }}
+    #If you specify multiple nodeSelectorTerms associated with nodeAffinity types,
+    #then the pod can be scheduled onto a node if one of the nodeSelectorTerms is satisfied.
+    #
+    #If you specify multiple matchExpressions associated with nodeSelectorTerms,
+    #then the pod can be scheduled onto a node only if all matchExpressions can be satisfied.
+    #
+    #valid operators: In, NotIn, Exists, DoesNotExist, Gt, Lt
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: beta.kubernetes.io/arch
+          operator: In
+          values:
+        {{- range $key, $val := .Values.arch }}
+          {{- if gt ($val | trunc 1 | int) 0 }}
+          - {{ $key }}
+          {{- end }}
+        {{- end }}
+{{- end }}
+
+{{- define "nodeAffinityPreferredDuringScheduling" }}
+  {{- range $key, $val := .Values.arch }}
+    {{- if gt ($val | trunc 1 | int) 0 }}
+    - weight: {{ $val | trunc 1 | int }}
+      preference:
+        matchExpressions:
+        - key: beta.kubernetes.io/arch
+          operator: In
+          values:
+          - {{ $key }}
+    {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/stable/ibm-swift-sample/templates/deployment.yaml b/stable/ibm-swift-sample/templates/deployment.yaml
@@ -25,6 +25,8 @@ spec:
       labels:
         app: "{{  .Chart.Name }}-selector"
     spec:
+      affinity:
+        {{- include "nodeaffinity" . | indent 6 }}
       containers:
       - name: "{{  .Chart.Name  }}"
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -35,6 +37,12 @@ spec:
             port: {{ .Values.service.servicePort }}
           initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
           periodSeconds: {{ .Values.livenessProbe.periodSeconds}}
+        readinessProbe:
+          httpGet:
+            path: /health
+            port: {{ .Values.service.servicePort }}
+          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
+          periodSeconds: {{ .Values.livenessProbe.periodSeconds}}
         resources:
           requests:
             cpu: "{{ .Values.image.resources.requests.cpu }}"

diff --git a/stable/ibm-swift-sample/values-metadata.yaml b/stable/ibm-swift-sample/values-metadata.yaml
@@ -16,6 +16,7 @@ image:
       type: "string"
       immutable: true
       required: true
+
 service:
   __metadata:
     label: "Service configuration"
@@ -49,3 +50,41 @@ service:
       type: "string"
       immutable: true
       required: true
+
+arch:
+  __metadata:
+  label: "Architecture scheduling preferences"
+  amd64:
+    __metadata:
+      name: "amd64"
+      label: "amd64"
+      description: "Architecture preference for target worker node."
+      type: "string"
+      immutable: false
+      required: true
+      options:
+      - label: "0 - Do not use"
+        value: "0 - Do not use"
+      - label: "1 - Least preferred"
+        value: "1 - Least preferred"
+      - label: "2 - No Preference"
+        value: "2 - No Preference"
+      - label: "3 - Most preferred"
+        value: "3 - Most preferred"
+  s390x:
+    __metadata:
+      name: "s390x"
+      label: "s390x scheduling preference"
+      description: "Architecture preference for target worker node."
+      type: "string"
+      immutable: false
+      required: true
+      options:
+      - label: "0 - Do not use"
+        value: "0 - Do not use"
+      - label: "1 - Least preferred"
+        value: "1 - Least preferred"
+      - label: "2 - No Preference"
+        value: "2 - No Preference"
+      - label: "3 - Most preferred"
+        value: "3 - Most preferred"
diff --git a/stable/ibm-swift-sample/values.yaml b/stable/ibm-swift-sample/values.yaml
@@ -24,3 +24,6 @@ hpa:
   metrics:
     cpu:
       targetAverageUtilization: 100m
+arch:
+  amd64: "3 - Most preferred"
+  s390x: "2 - No preference"