Merge branch 'master' into blackbox-module

incubator/kafka/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 description: Apache Kafka is publish-subscribe messaging rethought as a distributed
   commit log.
 name: kafka
-version: 0.16.2
+version: 0.16.3
 appVersion: 5.0.1
 keywords:
 - kafka

incubator/kafka/README.md

@@ -85,7 +85,7 @@ following configurable parameters:
 | `podAnnotations`                               | Annotation to be added to Kafka pods                                                                                                                                     | `{}`                                                               |
 | `podLabels`                                    | Labels to be added to Kafka pods                                                                                                                                     | `{}`                                                               |
 | `envOverrides`                                 | Add additional Environment Variables in the dictionary format                       | `{ zookeeper.sasl.enabled: "False" }`                              |
-| `configurationOverrides`                       | `Kafka ` [configuration setting][brokerconfigs] overrides in the dictionary format                                                                                       | `{ offsets.topic.replication.factor: 3 }`                          |
+| `configurationOverrides`                       | `Kafka ` [configuration setting][brokerconfigs] overrides in the dictionary format                                                                                       | `{ "confluent.support.metrics.enable": false }`                          |
 | `secrets`                                      | Pass any secrets to the kafka pods. Each secret will be passed as an environment variable by default. The secret can also be mounted to a specific path if required. Environment variable names are generated as: `<secretName>_<secretKey>` (All upper case) | `{}` |
 | `additionalPorts`                              | Additional ports to expose on brokers.  Useful when the image exposes metrics (like prometheus, etc.) through a javaagent instead of a sidecar                           | `{}`                                                               |
 | `readinessProbe.initialDelaySeconds`           | Number of seconds before probe is initiated.                                                                                                                             | `30`                                                               |

incubator/kafka/templates/_helpers.tpl

@@ -52,6 +52,14 @@ else use user-provided URL
 {{- end -}}
 {{- end -}}
 
+{{/*
+Derive offsets.topic.replication.factor in following priority order: configurationOverrides, replicas
+*/}}
+{{- define "kafka.replication.factor" }}
+{{- $replicationFactorOverride := index .Values "configurationOverrides" "offsets.topic.replication.factor" }}
+{{- default .Values.replicas $replicationFactorOverride }}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

incubator/kafka/templates/statefulset.yaml

@@ -158,6 +158,8 @@ spec:
               fieldPath: metadata.namespace
         - name: KAFKA_HEAP_OPTS
           value: {{ .Values.kafkaHeapOptions }}
+        - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
+          value: {{ include "kafka.replication.factor" . | quote }}
         {{- if not (hasKey .Values.configurationOverrides "zookeeper.connect") }}
         - name: KAFKA_ZOOKEEPER_CONNECT
           value: {{ include "zookeeper.url" . | quote }}

incubator/kafka/values.yaml

@@ -169,7 +169,6 @@ podLabels: {}
 ## ref: https://kafka.apache.org/documentation/#brokerconfigs
 ##
 configurationOverrides:
-  "offsets.topic.replication.factor": 3
   "confluent.support.metrics.enable": false  # Disables confluent metric submission
   # "auto.leader.rebalance.enable": true
   # "auto.create.topics.enable": true

incubator/mysqlha/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mysqlha
-version: 0.7.1
+version: 0.8.0
 appVersion: 5.7.13
 description: MySQL cluster with a single master and zero or more slave replicas
 keywords:

incubator/mysqlha/README.md

@@ -37,6 +37,7 @@ The following table lists the configurable parameters of the MySQL chart and the
 | -----------------------------------------    | ------------------------------------------------- | -------------------------------------- |
 | `mysqlImage`                                 | `mysql` image and tag.                            | `mysql:5.7.13`                         |
 | `xtraBackupImage`                            | `xtrabackup` image and tag.                       | `gcr.io/google-samples/xtrabackup:1.0` |
+| `imagePullPolicy`                            | Image pull policy.                                | `IfNotPresent`                         |
 | `replicaCount`                               | Number of MySQL replicas                          | 3                                      |
 | `mysqlRootPassword`                          | Password for the `root` user.                     | Randomly generated                     |
 | `mysqlUser`                                  | Username of new user to create.                   | `nil`                                  |

incubator/mysqlha/templates/NOTES.txt

@@ -12,8 +12,16 @@ To connect to your database:
 
 2. Run a pod to use as a client:
 
-    kubectl run mysql-client --image={{ .Values.mysqlImage }} -it --rm --restart=Never -- /bin/sh
+    kubectl run mysql-client --image={{ .Values.mysqlImage }} -it --rm --restart='Never' --namespace {{ .Release.Namespace }} -- /bin/sh
 
-2. Open a connection to one of the MySQL pods
+3. To connect to Master service (read/write):
 
-    mysql -h {{ template "fullname" . }}-0.{{ template "fullname" . }} -p
+    mysql -h {{ template "fullname" . }}-0.{{ template "fullname" . }} -u root -p
+
+{{- if lt 1 (.Values.mysqlha.replicaCount | int64) }}
+
+4. To connect to slave service (read-only):
+
+   mysql -h {{ template "fullname" . }}-readonly -u root -p
+
+{{- end }}

incubator/mysqlha/templates/statefulset.yaml

@@ -25,6 +25,7 @@ spec:
       initContainers:
       - name: clone-mysql
         image: {{ .Values.xtraBackupImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
         command:
           - bash
           - "-c"
@@ -58,6 +59,7 @@ spec:
           mountPath: /etc/mysql/conf.d
       - name: init-mysql
         image: {{ .Values.mysqlImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
         command: ["/bin/bash"]
         args:
           - "-c"
@@ -89,6 +91,7 @@ spec:
       containers:
       - name: mysql
         image: {{ .Values.mysqlImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
         env:
         - name: MYSQL_DATABASE
           value: {{ default "" .Values.mysqlha.mysqlDatabase | quote }}
@@ -146,6 +149,7 @@ spec:
           timeoutSeconds: 1
       - name: xtrabackup
         image: {{ .Values.xtraBackupImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
         env:
         - name: MYSQL_PWD
           valueFrom:
@@ -226,7 +230,7 @@ spec:
       {{- if .Values.metrics.enabled }}
       - name: metrics
         image: "{{ .Values.metrics.image }}:{{ .Values.metrics.imageTag }}"
-        imagePullPolicy: {{ .Values.pullPolicy | quote }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
         {{- if .Values.mysqlha.mysqlAllowEmptyPassword }}
         command: ['sh', '-c', 'DATA_SOURCE_NAME="root@(localhost:3306)/" /bin/mysqld_exporter' ]
         {{- else }}

incubator/mysqlha/values.yaml

@@ -4,6 +4,12 @@
 mysqlImage: mysql:5.7.13
 xtraBackupImage: gcr.io/google-samples/xtrabackup:1.0
 
+## Specify an imagePullPolicy (Required)
+## It's recommended to change this to 'Always' if the image tag is 'latest'
+## ref: http://kubernetes.io/docs/user-guide/images/#updating-images
+##
+imagePullPolicy: IfNotPresent
+
 mysqlha:
   replicaCount: 3
 
@@ -76,7 +82,6 @@ metrics:
   enabled: false
   image: prom/mysqld-exporter
   imageTag: v0.10.0
-  imagePullPolicy: IfNotPresent
   annotations: {}
 
   livenessProbe:

stable/ambassador/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 0.73.0
+appVersion: 0.74.1
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 3.1.0
+version: 3.2.0
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/
 sources:

stable/ambassador/README.md

@@ -62,7 +62,7 @@ The following tables lists the configurable parameters of the Ambassador chart a
 | `env`                              | Any additional environment variables for ambassador pods                        | `{}`                              |
 | `image.pullPolicy`                 | Ambassador image pull policy                                                    | `IfNotPresent`                    |
 | `image.repository`                 | Ambassador image                                                                | `quay.io/datawire/ambassador`     |
-| `image.tag`                        | Ambassador image tag                                                            | `0.72.0`                          |
+| `image.tag`                        | Ambassador image tag                                                            | `0.74.1`                          |
 | `imagePullSecrets`                 | Image pull secrets                                                              | `[]`                              |
 | `namespace.name`                   | Set the `AMBASSADOR_NAMESPACE` environment variable                             | `metadata.namespace`              |
 | `scope.singleNamespace`            | Set the `AMBASSADOR_SINGLE_NAMESPACE` environment variable and create namespaced RBAC if `rbac.enabled: true` | `false`                           |
@@ -93,10 +93,9 @@ The following tables lists the configurable parameters of the Ambassador chart a
 | `volumes`                          | Volumes for the ambassador service                                              | `[]`                              |
 | `pro.enabled`                      | Installs the Ambassador Pro container as a sidecar to Ambassador                | `false`                           |
 | `pro.image.repository`             | Ambassador Pro image                                                            | `quay.io/datawire/ambassador_pro` |
-| `pro.image.tag`                    | Ambassador Pro image tag                                                        | `amb-sidecar-0.4.0`               |
+| `pro.image.tag`                    | Ambassador Pro image tag                                                        | `amb-sidecar-0.6.0`               |
 | `pro.ports.auth`                   | Ambassador Pro authentication port                                              | `8500`                            |
-| `pro.ports.ratelimit`              | Ambassador Pro ratelimit port                                                   | `8501`                            |
-| `pro.ports.ratelimitDebug`         | Debug port for Ambassador Pro ratelimit                                         | `8502`                            |
+| `pro.ports.ratelimit`              | Ambassador Pro ratelimit port                                                   | `8500`                            |
 | `pro.licenseKey.value`             | License key for Ambassador Pro                                                  | ""                                |
 | `pro.licenseKey.secret`            | Stores the license key as a base64-encoded string in a Kubernetes secret        | `false`                           |
 | `autoscaling.enabled`              | If true, creates Horizontal Pod Autoscaler                                      | `false`                           |
@@ -110,19 +109,16 @@ The following tables lists the configurable parameters of the Ambassador chart a
 
 Ambassador configuration is done through annotations on Kubernetes services or Custom Resource Definitions (CRDs). The `service.annotations` section of the values file contains commented out examples of [Ambassador Module](https://www.getambassador.io/reference/core/ambassador) and a global [TLSContext](https://www.getambassador.io/reference/core/tls) configurations which are typically created in the Ambassador service.
 
-If you intend to use `service.annotations`, remember to include the `getambassador.io/config` annotation key as above,
-and remember that you'll have to escape newlines. For example, the annotation above could be defined as
-
-```
-service.annotations: { "getambassador.io/config": "---\napiVersion: ambassador/v1\nkind: Module\nname: ambassador\nconfig:\n  service_port: 8080" }
-```
+If you intend to use `service.annotations`, remember to include the `getambassador.io/config` annotation key as above.
 
 ### Ambassador Pro
 
 Setting `pro.enabled: true` will install Ambassador Pro as a sidecar to Ambassador with the required CRDs and redis instance.
 
 You must set the `pro.licenseKey.value` to the license key issued to you. Sign up for a [free trial](https://www.getambassador.io/pro/free-trial) of Ambassador Pro or [contact](https://www.getambassador.io/contact) our sales team to obtain a license key.
 
+`pro.ports.auth` and `pro.ports.ratelimit` must be the same value. If changing one, you must change the other.
+
 For most use cases, `pro.image` and `pro.ports` can be left as default.
 
 ### Specifying Values

stable/ambassador/templates/deployment.yaml

@@ -165,19 +165,13 @@ spec:
             containerPort: {{ .Values.pro.ports.auth }}
           - name: grpc-ratelimit
             containerPort: {{ .Values.pro.ports.ratelimit }}
-          - name: http-debug
-            containerPort: {{ .Values.pro.ports.ratelimitDebug }}
           env:
           - name: REDIS_SOCKET_TYPE
             value: tcp
           - name: REDIS_URL
             value: {{ include "ambassador.fullname" . }}-pro-redis:6379
-          - name: APRO_AUTH_PORT
+          - name: APRO_HTTP_PORT
             value: "{{ .Values.pro.ports.auth }}"
-          - name: GRPC_PORT
-            value: "{{ .Values.pro.ports.ratelimit }}"
-          - name: DEBUG_PORT
-            value: "{{ .Values.pro.ports.ratelimitDebug }}"
           - name: APP_LOG_LEVEL
             value: "{{ .Values.pro.logLevel  }}"
           - name: AMBASSADOR_NAMESPACE

stable/ambassador/values.yaml

@@ -46,7 +46,7 @@ securityContext:
 
 image:
   repository: quay.io/datawire/ambassador
-  tag: 0.73.0
+  tag: 0.74.1
   pullPolicy: IfNotPresent
 
 nameOverride: ""
@@ -216,11 +216,11 @@ pro:
   enabled: false
   image:
     repository: quay.io/datawire/ambassador_pro
-    tag: amb-sidecar-0.5.0
+    tag: amb-sidecar-0.6.0
+  # As of Ambassador Pro 0.6.0, both the RateLimitService and AuthService use the same port
   ports:
     auth: 8500
-    ratelimit: 8501
-    ratelimitDebug: 8502
+    ratelimit: 8500
   logLevel: info
   licenseKey:
     value:

stable/anchore-engine/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: anchore-engine
-version: 1.2.0
-appVersion: 0.4.1
+version: 1.2.1
+appVersion: 0.4.2
 description: Anchore container analysis and policy evaluation engine service
 keywords:
  - analysis

stable/anchore-engine/values.yaml

@@ -66,7 +66,7 @@ ingress:
 # Global configuration shared by all anchore-engine services.
 anchoreGlobal:
   # Image used for all anchore engine deployments (excluding enterprise components).
-  image: docker.io/anchore/anchore-engine:v0.4.1
+  image: docker.io/anchore/anchore-engine:v0.4.2
   imagePullPolicy: IfNotPresent
 
   # Add additionnal labels to all kubernetes resources

stable/cerebro/Chart.yaml

@@ -1,6 +1,6 @@
 name: cerebro
-version: 1.1.3
-appVersion: 0.8.3
+version: 1.1.5
+appVersion: 0.8.4
 apiVersion: v1
 description: A Helm chart for Cerebro - a web admin tool that replaces Kopf.
 home: https://github.com/lmenezes/cerebro

stable/cerebro/README.md

@@ -42,7 +42,7 @@ The following table lists the configurable parameters of the cerebro chart and t
 |-------------------------------------|-------------------------------------|-------------------------------------------|
 | `replicaCount`                      | Number of replicas                  | `1`                                       |
 | `image.repository`                  | The image to run                    | `lmenezes/cerebro`                        |
-| `image.tag`                         | The image tag to pull               | `0.8.3`                                   |
+| `image.tag`                         | The image tag to pull               | `0.8.4`                                   |
 | `image.pullPolicy`                  | Image pull policy                   | `IfNotPresent`                            |
 | `image.pullSecrets`                 | Specify image pull secrets          | `nil` (does not add image pull secrets to deployed pods) |
 | `init.image.repository`             | The image to run                    | `docker.io/busybox`                       |

stable/cerebro/templates/deployment.yaml

@@ -68,12 +68,12 @@ spec:
           {{- end }}
           livenessProbe:
             httpGet:
-              path: /
+              path: {{ .Values.config.basePath }}
               port: http
             initialDelaySeconds: 120
           readinessProbe:
             httpGet:
-              path: /
+              path: {{ .Values.config.basePath }}
               port: http
             initialDelaySeconds: 120
           resources:

stable/cerebro/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: lmenezes/cerebro
   # Note: when updating the version, ensure `config` and the ConfigMap are kept
   # in sync with the default configuration of the upstream image
-  tag: 0.8.3
+  tag: 0.8.4
   pullPolicy: IfNotPresent
 
 init:

stable/cluster-autoscaler/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 description: Scales worker nodes within autoscaling groups.
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 name: cluster-autoscaler
-version: 3.1.0
+version: 3.2.0
 appVersion: 1.13.1
 home: https://github.com/kubernetes/autoscaler
 sources:

stable/cluster-autoscaler/README.md

@@ -150,6 +150,7 @@ Parameter | Description | Default
 `extraArgs` | additional container arguments | `{}`
 `podDisruptionBudget` | Pod disruption budget | `maxUnavailable: 1`
 `extraEnv` | additional container environment variables | `{}`
+`envFromConfigMap` |  additional container environment variables from a configmap | `[]`
 `envFromSecret` | additional container environment variables from secret | `nil`
 `nodeSelector` | node labels for pod assignment | `{}`
 `podAnnotations` | annotations to add to each pod | `{}`

stable/cluster-autoscaler/templates/deployment.yaml

@@ -142,6 +142,13 @@ spec:
             - name: {{ $key }}
               value: "{{ $value }}"
           {{- end }}
+          {{- range $key, $value := .Values.envFromConfigMap }}
+            - name: {{ $key }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ default (include "cluster-autoscaler.fullname" $) $value.name }}
+                  key: {{ required "Must specify key!" $value.key }}
+          {{- end }}
           {{- if .Values.envFromSecret }}
           envFrom:
             - secretRef:

stable/dex/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: dex
-version: 1.5.1
+version: 2.0.1
 appVersion: 2.17.0
 description: CoreOS Dex
 keywords:
@@ -17,3 +17,5 @@ maintainers:
   email: shane.starcher@gmail.com
 - name: rendhalver
   email: pete.brown@powerhrg.com
+- name: vi7
+  email: vi7alya@gmail.com

stable/dex/OWNERS

@@ -1,4 +1,6 @@
 approvers:
 - desaintmartin
+- vi7
 reviewers:
 - desaintmartin
+- vi7