Merge remote-tracking branch 'upstream/master' into feature/kafka-man…

…ager-amd64 Signed-off-by: Jon Stelly <967068+jonstelly@users.noreply.github.com>
helm · Mar 9, 2020 · 071f7f7 · 071f7f7
2 parents 2b50c6c + e92f08c
commit 071f7f7
Show file tree

Hide file tree

Showing 797 changed files with 11,831 additions and 5,329 deletions.
diff --git a/incubator/cassandra/Chart.yaml b/incubator/cassandra/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: cassandra
-version: 0.13.4
+version: 0.14.2
 appVersion: 3.11.5
 description: Apache Cassandra is a free and open-source distributed database management
   system designed to handle large amounts of data across many commodity servers, providing

diff --git a/incubator/cassandra/README.md b/incubator/cassandra/README.md
@@ -128,6 +128,7 @@ The following table lists the configurable parameters of the Cassandra chart and
 | `persistence.size`                   | Size of data volume                             | `10Gi`                                                     |
 | `resources`                          | CPU/Memory resource requests/limits             | Memory: `4Gi`, CPU: `2`                                    |
 | `service.type`                       | k8s service type exposing ports, e.g. `NodePort`| `ClusterIP`                                                |
+| `service.annotations`                | Annotations to apply to cassandra service       | `""`                                                       |
 | `podManagementPolicy`                | podManagementPolicy of the StatefulSet          | `OrderedReady`                                             |
 | `podDisruptionBudget`                | Pod distruption budget                          | `{}`                                                       |
 | `podAnnotations`                     | pod annotations for the StatefulSet             | `{}`                                                       |

diff --git a/incubator/cassandra/templates/backup/cronjob.yaml b/incubator/cassandra/templates/backup/cronjob.yaml
@@ -66,23 +66,25 @@ spec:
             secret:
               secretName: {{ $backup.google.serviceAccountSecret | quote }}
 {{- end }}
-        affinity:
-          podAffinity:
-            preferredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - {{ template "cassandra.fullname" $ }}
-                - key: release
-                  operator: In
-                  values:
-                  - {{ $release.Name }}
-              topologyKey: "kubernetes.io/hostname"
-      {{- with $values.tolerations }}
-        tolerations:
-{{ toYaml . | indent 10 }}
-      {{- end }}
+          affinity:
+            podAffinity:
+              preferredDuringSchedulingIgnoredDuringExecution:
+              - weight: 1
+                podAffinityTerm:
+                  labelSelector:
+                    matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                      - {{ template "cassandra.fullname" $ }}
+                    - key: release
+                      operator: In
+                      values:
+                      - {{ $release.Name }}
+                  topologyKey: "kubernetes.io/hostname"
+          {{- with $values.tolerations }}
+          tolerations:
+{{ toYaml . | indent 12 }}
+          {{- end }}
 {{- end }}
 {{- end }}
diff --git a/incubator/cassandra/templates/service.yaml b/incubator/cassandra/templates/service.yaml
@@ -7,6 +7,10 @@ metadata:
     chart: {{ template "cassandra.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   clusterIP: None
   type: {{ .Values.service.type }}

diff --git a/incubator/cassandra/templates/statefulset.yaml b/incubator/cassandra/templates/statefulset.yaml
@@ -49,6 +49,20 @@ spec:
 {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.configOverrides }}
+      initContainers:
+      - name: config-copier
+        image: busybox
+        command: [ 'sh', '-c', 'cp /configmap-files/* /cassandra-configs/ && chown 999:999 /cassandra-configs/*']
+        volumeMounts:
+{{- range $key, $value := .Values.configOverrides }}
+        - name: cassandra-config-{{ $key | replace "." "-" | replace "_" "--" }}
+          mountPath: /configmap-files/{{ $key }}
+          subPath: {{ $key }}
+{{- end }}
+        - name: cassandra-configs
+          mountPath: /cassandra-configs/
 {{- end }}
       containers:
 {{- if .Values.exporter.enabled }}
@@ -153,11 +167,10 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /var/lib/cassandra
-{{- range $key, $value := .Values.configOverrides }}
-        - name: cassandra-config-{{ $key | replace "." "-" }}
-          mountPath: /etc/cassandra/{{ $key }}
-          subPath: {{ $key }}
-{{- end }}
+        {{- if .Values.configOverrides }}
+        - name: cassandra-configs
+          mountPath: /etc/cassandra
+        {{- end }}
         {{- if not .Values.persistence.enabled }}
         lifecycle:
           preStop:
@@ -175,7 +188,11 @@ spec:
 {{- range $key, $value := .Values.configOverrides }}
       - configMap:
           name: cassandra
-        name: cassandra-config-{{ $key | replace "." "-" }}
+        name: cassandra-config-{{ $key | replace "." "-" | replace "_" "--" }}
+{{- end }}
+{{- if .Values.configOverrides }}
+      - name: cassandra-configs
+        emptyDir: {}
 {{- end }}
 {{- if not .Values.persistence.enabled }}
       - name: data

diff --git a/incubator/cassandra/values.yaml b/incubator/cassandra/values.yaml
@@ -12,6 +12,7 @@ image:
 ## ref: http://kubernetes.io/docs/user-guide/services/
 service:
   type: ClusterIP
+  annotations: ""
 
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/

diff --git a/incubator/mysqlha/Chart.yaml b/incubator/mysqlha/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mysqlha
-version: 1.0.0
+version: 1.0.1
 appVersion: 5.7.13
 description: MySQL cluster with a single master and zero or more slave replicas
 keywords:

diff --git a/incubator/mysqlha/README.md b/incubator/mysqlha/README.md
@@ -8,7 +8,7 @@ This chart bootstraps a single master and multiple slave MySQL deployment on a [
 
 ## Prerequisites
 
-- Kubernetes 1.6+
+- Kubernetes 1.10+ with Beta APIs enabled
 - PV provisioner support in the underlying infrastructure
 
 ## Installing the Chart

diff --git a/incubator/mysqlha/templates/statefulset.yaml b/incubator/mysqlha/templates/statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "fullname" . }}
@@ -8,12 +8,17 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
+      release: {{ .Release.Name }}
   serviceName: {{ template "fullname" . }}
   replicas: {{ .Values.mysqlha.replicaCount }}
   template:
     metadata:
       labels:
         app: {{ template "fullname" . }}
+        release: {{ .Release.Name }}
       {{- if .Values.mysqlha.podAnnotations }}
       annotations:
 {{ toYaml .Values.mysqlha.podAnnotations | indent 8 }}

diff --git a/incubator/mysqlha/values.yaml b/incubator/mysqlha/values.yaml
@@ -1,7 +1,7 @@
 ## mysql image version
 ## ref: https://hub.docker.com/r/library/mysql/tags/
 ##
-mysqlImage: mysql:5.7.13
+mysqlImage: mysql:5.7.29
 xtraBackupImage: gcr.io/google-samples/xtrabackup:1.0
 
 ## Specify an imagePullPolicy (Required)

diff --git a/incubator/schema-registry/Chart.yaml b/incubator/schema-registry/Chart.yaml
@@ -1,6 +1,6 @@
 name: schema-registry
 home: https://docs.confluent.io/current/schema-registry/docs/index.html
-version: 1.1.8
+version: 1.1.9
 appVersion: 5.0.1
 keywords:
   - confluent

diff --git a/incubator/schema-registry/templates/deployment.yaml b/incubator/schema-registry/templates/deployment.yaml
@@ -107,34 +107,9 @@ spec:
               name: jmx
             {{- end }}
           livenessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.servicePort }}
-            {{- if not .Values.livenessProbe }}
-            initialDelaySeconds: 10
-            timeoutSeconds: 5
-            {{- else }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 10}}
-            {{- if .Values.livenessProbe.periodSeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            {{- end }}
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
-            {{- if .Values.livenessProbe.successThreshold }}
-            successThreshold: {{ .Values.livenessProbe.successThreshold }}
-            {{- end }}
-            {{- if .Values.livenessProbe.failureThreshold }}
-            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-            {{- end }}
-            {{- end }}
+{{ toYaml .Values.livenessProbe | indent 12 }}
           readinessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.servicePort }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 10}}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
-            successThreshold: {{ .Values.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+{{ toYaml .Values.readinessProbe | indent 12 }}
           env:
           - name: SCHEMA_REGISTRY_HOST_NAME
             valueFrom:

diff --git a/incubator/schema-registry/values.yaml b/incubator/schema-registry/values.yaml
@@ -59,10 +59,19 @@ kafkaStore:
   ## Additional Java arguments to pass to Kafka.
   # schemaRegistryOpts: -Dfoo=bar
 
-## Readiness probe config.
+## Liveness and readiness probe config.
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
 ##
+livenessProbe:
+  httpGet:
+    path: /
+    port: 8081
+  initialDelaySeconds: 10
+  timeoutSeconds: 5
 readinessProbe:
+  httpGet:
+    path: /
+    port: 8081
   initialDelaySeconds: 10
   periodSeconds: 10
   timeoutSeconds: 5

diff --git a/incubator/solr/Chart.yaml b/incubator/solr/Chart.yaml
@@ -2,8 +2,8 @@
 
 apiVersion: "v1"
 name: "solr"
-version: "1.3.3"
-appVersion: "7.7.2"
+version: "1.4.0"
+appVersion: "8.4.0"
 description: "A helm chart to install Apache Solr: http://lucene.apache.org/solr/"
 keywords:
   - "solr"

diff --git a/incubator/solr/requirements.lock b/incubator/solr/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: zookeeper
   repository: https://kubernetes-charts-incubator.storage.googleapis.com/
-  version: 1.2.2
-digest: sha256:535c0850e71490a52df2686fc1f0b3c737535388df646e1eefe1f0a76999283e
-generated: 2019-02-05T15:07:14.273428Z
+  version: 2.1.3
+digest: sha256:ce79cf63a1284c16e6b615a3dea62e619ce99dea85419be5b46a8ee6ceec3b4e
+generated: 2020-01-17T16:30:14.272428Z+02:00"
diff --git a/incubator/solr/requirements.yaml b/incubator/solr/requirements.yaml
@@ -2,5 +2,5 @@
 
 dependencies:
   - name: zookeeper
-    version: 1.2.2
+    version: 2.1.3
     repository: "https://kubernetes-charts-incubator.storage.googleapis.com/"
diff --git a/incubator/solr/values.yaml b/incubator/solr/values.yaml
@@ -29,7 +29,7 @@ terminationGracePeriodSeconds: 180
 # Solr image settings
 image:
   repository: solr
-  tag: 7.7.2
+  tag: 8.4.0
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.

diff --git a/incubator/sparkoperator/Chart.yaml b/incubator/sparkoperator/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: sparkoperator
 description: A Helm chart for Spark on Kubernetes operator
-version: 0.6.3
-appVersion: v1beta2-1.0.1-2.4.4
+version: 0.6.6
+appVersion: v1beta2-1.1.0-2.4.5
 keywords:
   - spark
 home: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator

diff --git a/incubator/sparkoperator/README.md b/incubator/sparkoperator/README.md
@@ -28,7 +28,7 @@ If using Helm 3, then install the chart by running:
 $ helm install incubator/sparkoperator --generate-name --namespace spark-operator --set sparkJobNamespace=default
 ```
 
-or 
+or
 
 ```bash
 $ helm install [RELEASE-NAME] incubator/sparkoperator --namespace spark-operator --set sparkJobNamespace=default
@@ -43,7 +43,7 @@ The following table lists the configurable parameters of the Spark operator char
 | Parameter                 | Description                                                  | Default                                |
 | ------------------------- | ------------------------------------------------------------ | -------------------------------------- |
 | `operatorImageName`       | The name of the operator image                               | `gcr.io/spark-operator/spark-operator` |
-| `operatorVersion`         | The version of the operator to install                       | `v1beta2-1.0.1-2.4.4`                  |
+| `operatorVersion`         | The version of the operator to install                       | `v1beta2-1.1.0-2.4.5`                  |
 | `imagePullPolicy`         | Docker image pull policy                                     | `IfNotPresent`                         |
 | `imagePullSecrets`        | Docker image pull secrets                                    |                                        |
 | `replicas`                | The number of replicas of the operator Deployment            | 1                                      |
@@ -63,12 +63,18 @@ The following table lists the configurable parameters of the Spark operator char
 | `resources`               | Resources needed for the sparkoperator deployment            | {}                                     |
 | `enableBatchScheduler`    | Whether to enable batch scheduler for pod scheduling         | false                                  |
 | `enableResourceQuotaEnforcement`    | Whether to enable the ResourceQuota enforcement for SparkApplication resources. Requires the webhook to be enabled by setting enableWebhook to true.         | false                                  |
-| `enableLeaderElection`    | Whether to enable leader election when the operator Deployment has more than one replica, i.e., when `replicas` is greater than 1.         | false                                  |
+| `leaderElection.enable`   | Whether to enable leader election when the operator Deployment has more than one replica, i.e., when `replicas` is greater than 1.         | false                                  |
+| `leaderElection.lockName` | Lock name to use for leader election                         | `spark-operator-lock`                  |
+| `leaderElection.lockNamespace` | Namespace to use for leader election                    | (namespace of release)                 |
 | `securityContext` | Defines security context for operator container. | `{}` |
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
 
 #### Upgrading
 
+##### To 0.6.5
+
+- `enableLeaderElection` has been renamed `leaderElection.enable` to keep all of the leader election stuff together
+
 ##### To 0.6.2
 
 ###### Breaking changes
@@ -82,4 +88,3 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 #### Contributing
 
 When making changes to values.yaml, update the files in `ci/` by running `hack/update-ci.sh`.
-
diff --git a/incubator/sparkoperator/ci/test-values.yaml b/incubator/sparkoperator/ci/test-values.yaml
@@ -1,8 +1,7 @@
 operatorImageName: gcr.io/spark-operator/spark-operator
-operatorVersion: v1beta2-1.0.1-2.4.4
+operatorVersion: v1beta2-1.1.0-2.4.5
 imagePullPolicy: IfNotPresent
 imagePullSecrets: []
-replicas: 1
 
 rbac:
   create: true
@@ -17,7 +16,6 @@ serviceAccounts:
 
 sparkJobNamespace: ""
 installCrds: true
-cleanupCrdsBeforeInstall: true
 controllerThreads: 10
 resyncInterval: 30
 ingressUrlFormat: ""
@@ -57,4 +55,9 @@ enableResourceQuotaEnforcement: false
 ## Whether to enable leader election when the operator Deployment has more than one replica.
 ## Only applicable when `replicas` is set to a value greater than 1.
 ## Ref: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator/blob/master/docs/user-guide.md#enabling-leader-election-for-high-availability.
-enableLeaderElection: false
+leaderElection:
+  enable: false
+  lockName: "spark-operator-lock"
+  ## Optionally store the lock in another namespace. Defaults to operator's namespace
+  # lockNamespace: ""
+replicas: 1
diff --git a/incubator/sparkoperator/templates/_helpers.tpl b/incubator/sparkoperator/templates/_helpers.tpl
@@ -46,3 +46,13 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccounts.spark.name }}
 {{- end -}}
 {{- end -}}
+ {{/*
+Create the leader-election namespace to use
+*/}}
+{{- define "sparkoperator.leaderElectionLockNamespace" -}}
+{{- if .Values.leaderElection.lockNamespace -}}
+    {{- .Values.leaderElection.lockNamespace -}}
+{{- else -}}
+    {{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}