Merge remote-tracking branch 'upstream/master'

* upstream/master: (35 commits)
  Add NetworkPolicy to Jenkins (helm#1228)
  Support setting up redis without password (helm#1061)
  [stable/rabbitmq] Release 0.5.3 (helm#1174)
  [stable/wordpress] Release 0.6.3 (helm#1187)
  Rename MARIADB_PORT env var to MARIADB_PORT_NUMBER (helm#1211)
  Rename MARIADB_PORT env var to MARIADB_PORT_NUMBER (helm#1207)
  dokuwiki: fix probes to properly query pod health (helm#1152)
  Rename MARIADB_PORT env var to MARIADB_PORT_NUMBER (helm#1209)
  joomla: fix probes to properly query pod health (helm#1161)
  jasperreports: fix probes to properly query pod health (helm#1160)
  [stable/moodle] Release 0.1.8 (helm#1188)
  [stable/owncloud] Release 0.4.10 (helm#1175)
  prestashop: fix probes to properly query pod health (helm#1149)
  update incubator repo to stable repo (helm#1162)
  Prepending the commands with '$' (helm#1145)
  [stable/fluent-bit] Update README for Minikube use case (helm#1253)
  Update the char limit of fullname to 63 for memcached chart (helm#1185)
  opencart: fix probes to properly query pod health (helm#1166)
  [stable/joomla] Release 0.4.9 (helm#1204)
  [stable/phabricator] Release 0.4.8 (helm#1205)
  ...

Author: lachie83

incubator/istio/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 description: Istio Helm chart for Kubernetes
 name: istio
-version: 0.1.4
+version: 0.1.6
 appVersion: 0.1.5
 home: https://istio.io/
-icon: https://github.com/istio/istio.github.io/blob/master/favicons/android-chrome-96x96.png
+icon: https://raw.githubusercontent.com/istio/istio.github.io/master/favicons/mstile-150x150.png
 sources:
   - https://github.com/istio/istio
 maintainers:

incubator/istio/templates/NOTES.txt

@@ -44,3 +44,7 @@ Deploy your App!
 Or deploy the BookInfo App!
 
   https://istio.io/docs/samples/bookinfo.html
+
+Using Istioctl
+
+  istioctl --managerAPIService {{ $serviceName }}-{{ .Values.manager.name }}:{{ .Values.manager.service.externalHttpApiServer }} [command]

incubator/kafka/README.md

@@ -35,16 +35,16 @@ To install the chart with the release name `my-release` in the default
 namespace:
 
 ```
-helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
-helm install --name my-kafka incubator/kafka
+$ helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
+$ helm install --name my-kafka incubator/kafka
 ```
 
 If using a dedicated namespace(recommended) then make sure the namespace
 exists with:
 
 ```
-kubectl create ns kafka
-helm install --name my-kafka --set global.namespace=kafka incubator/kafka
+$ kubectl create ns kafka
+$ helm install --name my-kafka --set global.namespace=kafka incubator/kafka
 ```
 
 This chart includes a ZooKeeper chart as a dependency to the Kafka

stable/consul/Chart.yaml

@@ -1,10 +1,11 @@
 name: consul
 home: https://github.com/hashicorp/consul
-version: 0.2.3
+version: 0.2.5
+appVersion: 0.7.5
 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy.
-icon: https://www.consul.io/assets/images/logo_large-475cebb0.png
+icon: https://raw.githubusercontent.com/hashicorp/consul/bce3809dfca37b883828c3715b84143dd71c0f85/website/source/assets/images/favicons/android-chrome-512x512.png
 sources:
   - https://github.com/kelseyhightower/consul-on-kubernetes
 maintainers:
-  - name: Lachlan Evenson
-    email: lachlan@deis.com
+  - name: lachie83
+    email: lachlan.evenson@microsoft.com

stable/consul/README.md

@@ -33,10 +33,11 @@ The following tables lists the configurable parameters of the consul chart and t
 | `Replicas`              | k8s statefulset replicas              | `3`                                                        |
 | `Component`             | k8s selector key                      | `consul`                                                   |
 | `Cpu`                   | container requested cpu               | `100m`                                                     |
-| `DisableHostNodeId`     | Disable Node Id creation (uses random)| `false`                                                   |
+| `DatacenterName`        | Consul Datacenter Name                | `dc1` (The consul default)                                 |
+| `DisableHostNodeId`     | Disable Node Id creation (uses random)| `false`                                                    |
 | `Memory`                | container requested memory            | `512Mi`                                                    |
 | `Storage`               | Persistent volume size                | `1Gi`                                                      |
-| `StorageClass`          | Persistent volume storage class       | `nil`                                                  |
+| `StorageClass`          | Persistent volume storage class       | `nil`                                                      |
 | `HttpPort`              | Consul http listening port            | `8500`                                                     |
 | `RpcPort`               | Consul rpc listening port             | `8400`                                                     |
 | `SerflanPort`           | Container serf lan listening port     | `8301`                                                     |
@@ -46,7 +47,7 @@ The following tables lists the configurable parameters of the consul chart and t
 | `ServerPort`            | Container server listening port       | `8300`                                                     |
 | `ConsulDnsPort`         | Container dns listening port          | `8600`                                                     |
 | `ui.enabled`            | Enable Consul Web UI                  | `false`                                                    |
-| `uiService.enabled`      | Create dedicated Consul Web UI svc    | `false`                                                    |
+| `uiService.enabled`     | Create dedicated Consul Web UI svc    | `false`                                                    |
 | `uiService.type`        | Dedicate Consul Web UI svc type       | `NodePort`                                                 |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.

stable/consul/templates/consul.yaml

@@ -172,6 +172,9 @@ spec:
             {{- end }}
             {{- if .Values.DisableHostNodeId }}
               -disable-host-node-id \
+            {{- end }}
+            {{- if .Values.DatacenterName }}
+              -datacenter {{ .Values.DatacenterName }} \
             {{- end }}
               -data-dir=/var/lib/consul \
               -server \

stable/consul/values.yaml

@@ -28,6 +28,10 @@ Storage: "1Gi"
 ## host id.
 DisableHostNodeId: false
 
+## Datacenter name for consul. If not supplied, will use the consul
+## default 'dc1'
+# DatacenterName: dc1
+
 ## StorageClass name for use with Persistent Volume Claim (PVC) using beta notations
 # StorageClass:
 

stable/dokuwiki/Chart.yaml

@@ -1,5 +1,5 @@
 name: dokuwiki
-version: 0.1.4
+version: 0.1.5
 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. All data is stored in plain text files, so no database is required.
 keywords:
 - dokuwiki

stable/dokuwiki/templates/deployment.yaml

@@ -38,16 +38,18 @@ spec:
           containerPort: 443
         livenessProbe:
           httpGet:
-            path: /
+            path: /doku.php
             port: http
           initialDelaySeconds: 120
           timeoutSeconds: 5
+          failureThreshold: 6
         readinessProbe:
           httpGet:
-            path: /
+            path: /doku.php
             port: http
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
+          initialDelaySeconds: 30
+          timeoutSeconds: 3
+          periodSeconds: 5
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         volumeMounts:

stable/fluent-bit/Chart.yaml

@@ -1,6 +1,6 @@
 name: fluent-bit
 version: 0.1.0
-appVersion: 0.11.7
+appVersion: 0.11.8
 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX
 keywords:
 - fluent

stable/fluent-bit/README.md

@@ -1,12 +1,13 @@
-# fluent-bit Chart
+# Fluent-Bit Chart
 
 [Fluent Bit](http://fluentbit.io/) is an open source and multi-platform Log Forwarder.
 
 ## Chart Details
+
 This chart will do the following:
 
-* Install a configmap for fluent bit
-* Install a daemonset that provisions the fluent bit [per-host architecture]
+* Install a configmap for Fluent Bit
+* Install a daemonset that provisions Fluent Bit [per-host architecture]
 
 ## Installing the Chart
 
@@ -16,6 +17,12 @@ To install the chart with the release name `my-release`:
 $ helm install --name my-release stable/fluent-bit
 ```
 
+When installing this chart on [Minikube](https://kubernetes.io/docs/getting-started-guides/minikube/), it's required to specify that so the DaemonSet will be able to mount the log files properly, make sure to append the _--set on\_minikube=true_ option at the end of the _helm_ command, e.g:
+
+```bash
+$ helm install --name my-release stable/fluent-bit --set on_minikube=true
+```
+
 ## Configuration
 
 Configurable values are documented in the `values.yaml`.

stable/fluent-bit/values.yaml

@@ -5,7 +5,7 @@ on_minikube: false
 image:
   fluent_bit:
     repository: fluent/fluent-bit
-    tag: 0.11.7
+    tag: 0.11.8
   pullPolicy: IfNotPresent
 
 backend:

stable/ghost/Chart.yaml

@@ -1,5 +1,5 @@
 name: ghost
-version: 0.4.9
+version: 0.4.10
 description: A simple, powerful publishing platform that allows you to share your stories with the world
 keywords:
 - ghost

stable/ghost/templates/deployment.yaml

@@ -22,7 +22,7 @@ spec:
         env:
         - name: MARIADB_HOST
           value: {{ template "mariadb.fullname" . }}
-        - name: MARIADB_PORT
+        - name: MARIADB_PORT_NUMBER
           value: "3306"
         - name: MARIADB_PASSWORD
           valueFrom:
@@ -31,7 +31,7 @@ spec:
               key: mariadb-root-password
         - name: GHOST_HOST
           value: {{ include "host" . | quote }}
-        - name: GHOST_PORT
+        - name: GHOST_PORT_NUMBER
           {{- if eq .Values.serviceType "ClusterIP" }}
           value: "2368"
           {{- else }}

stable/ghost/values.yaml

@@ -1,7 +1,7 @@
 ## Bitnami Ghost image version
 ## ref: https://hub.docker.com/r/bitnami/ghost/tags/
 ##
-image: bitnami/ghost:0.11.9-r0
+image: bitnami/ghost:0.11.9-r2
 
 ## Specify a imagePullPolicy
 ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

stable/jasperreports/Chart.yaml

@@ -1,5 +1,5 @@
 name: jasperreports
-version: 0.1.6
+version: 0.1.7
 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, and a dashboard feature for compiling multiple custom views
 keywords:
 - business intelligence

stable/jasperreports/templates/deployment.yaml

@@ -20,7 +20,7 @@ spec:
         env:
         - name: MARIADB_HOST
           value: {{ template "mariadb.fullname" . }}
-        - name: MARIADB_PORT
+        - name: MARIADB_PORT_NUMBER
           value: "3306"
         - name: MARIADB_PASSWORD
           valueFrom:
@@ -56,16 +56,18 @@ spec:
           containerPort: 8080
         livenessProbe:
           httpGet:
-            path: /jasperserver/
+            path: /jasperserver/login.html
             port: http
           initialDelaySeconds: 300
           timeoutSeconds: 5
+          failureThreshold: 6
         readinessProbe:
           httpGet:
-            path: /jasperserver/
+            path: /jasperserver/login.html
             port: http
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
+          initialDelaySeconds: 30
+          timeoutSeconds: 3
+          periodSeconds: 5
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         volumeMounts:

stable/jasperreports/values.yaml

@@ -1,7 +1,7 @@
 ## Bitnami JasperReports image version
 ## ref: https://hub.docker.com/r/bitnami/jasperreports/tags/
 ##
-image: bitnami/jasperreports:6.3.0-r10
+image: bitnami/jasperreports:6.3.0-r11
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

stable/jenkins/Chart.yaml

@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.7.0
+version: 0.7.3
 appVersion: 2.46.3
 description: Open source continuous integration server. It supports multiple SCM tools including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based projects as well as arbitrary scripts.
 sources:

stable/jenkins/README.md

@@ -71,6 +71,17 @@ $ helm install --name my-release -f values.yaml stable/jenkins
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
 
+## NetworkPolicy
+
+To make use of the NetworkPolicy resources created by default,
+install [a networking plugin that implements the Kubernetes
+NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin).
+
+For Kubernetes v1.5 & v1.6, you must also turn on NetworkPolicy by setting
+the DefaultDeny namespace annotation. Note: this will enforce policy for _all_ pods in the namespace:
+
+    kubectl annotate namespace default "net.beta.kubernetes.io/network-policy={\"ingress\":{\"isolation\":\"DefaultDeny\"}}"
+
 ## Persistence
 
 The Jenkins image stores persistence under `/var/jenkins_home` path of the container. A dynamically managed Persistent Volume

stable/jenkins/templates/config.yaml

@@ -35,7 +35,7 @@ data:
               <name>default</name>
               <instanceCap>2147483647</instanceCap>
               <idleMinutes>0</idleMinutes>
-              <label></label>
+              <label>{{.Release.Name}}-{{.Values.Agent.Component}}</label>
               <nodeSelector></nodeSelector>
               <volumes/>
               <containers>
@@ -117,7 +117,7 @@ data:
     echo "false" > /usr/share/jenkins/ref/secrets/slave-to-master-security-kill-switch;
     cp -n /var/jenkins_config/config.xml /var/jenkins_home;
 {{- if .Values.Master.InstallPlugins }}
-    cp -n /var/jenkins_config/plugins.txt /var/jenkins_home;
+    cp /var/jenkins_config/plugins.txt /var/jenkins_home;
     /usr/local/bin/install-plugins.sh `echo $(cat /var/jenkins_home/plugins.txt)`;
 {{- end }}
 {{- if .Values.Master.ScriptApproval }}

stable/jenkins/templates/jenkins-master-deployment.yaml

@@ -23,6 +23,7 @@ spec:
         chart: "{{.Chart.Name}}-{{.Chart.Version}}"
         component: "{{.Release.Name}}-{{.Values.Master.Component}}"
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
         pod.alpha.kubernetes.io/init-containers: '[
               {
                   "name": "copy-default-config",

stable/jenkins/templates/jenkins-master-ingress.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.Master.HostName }}
-apiVersion: extensions/v1beta1
+apiVersion: {{ .Values.NetworkPolicy.ApiVersion }}
 kind: Ingress
 metadata:
 {{- if .Values.Master.Ingress.Annotations }}

stable/jenkins/templates/jenkins-master-networkpolicy.yaml

@@ -0,0 +1,33 @@
+{{- if .Values.NetworkPolicy.Enabled }}
+kind: NetworkPolicy
+apiVersion: {{ .Values.NetworkPolicy.ApiVersion }}
+metadata:
+  name: "{{.Release.Name}}-{{.Values.Master.Component}}"
+spec:
+  podSelector:
+    matchLabels:
+      component: "{{.Release.Name}}-{{.Values.Master.Component}}"
+  ingress:
+    # Allow web access to the UI
+    - ports:
+      - port: {{.Values.Master.ContainerPort}}
+    # Allow inbound connections from slave
+    - from:
+      - podSelector:
+          matchLabels:
+            "jenkins/{{.Release.Name}}-{{.Values.Agent.Component}}": "true"
+      ports:
+      - port: {{.Values.Master.SlaveListenerPort}}
+{{- if .Values.Agent.Enabled }}
+---
+kind: NetworkPolicy
+apiVersion: {{ .Values.NetworkPolicy.ApiVersion }}
+metadata:
+  name: "{{.Release.Name}}-{{.Values.Agent.Component}}"
+spec:
+  podSelector:
+    matchLabels:
+      # DefaultDeny
+      "jenkins/{{.Release.Name}}-{{.Values.Agent.Component}}": "true"
+{{- end }}
+{{- end }}

stable/jenkins/values.yaml

@@ -38,6 +38,7 @@ Master:
   InstallPlugins:
       - kubernetes:0.11 
       - workflow-aggregator:2.5
+      - workflow-job:2.11
       - credentials-binding:1.11
       - git:3.2.0
 # Used to approve a list of groovy functions in pipelines used the script-security plugin. Can be viewed under /scriptApproval
@@ -64,6 +65,7 @@ Agent:
   Enabled: true
   Image: jenkinsci/jnlp-slave
   ImageTag: 2.62
+  Component: "jenkins-slave"
   Privileged: false
   Cpu: "200m"
   Memory: "256Mi"
@@ -88,3 +90,10 @@ Persistence:
 #  - mountPath: /var/nothing
 #    name: nothing
 #    readOnly: true
+
+NetworkPolicy:
+  # Enable creation of NetworkPolicy resources.
+  Enabled: false
+  # For Kubernetes v1.4, v1.5 and v1.6, use 'extensions/v1beta1'
+  # For Kubernetes v1.7, use 'networking.k8s.io/v1'
+  ApiVersion: extensions/v1beta1

stable/joomla/Chart.yaml

@@ -1,5 +1,5 @@
 name: joomla
-version: 0.4.8
+version: 0.4.9
 description: PHP content management system (CMS) for publishing web content
 keywords:
 - joomla