Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
Merge branch 'superset-annotations' into volvo-custom
Browse files Browse the repository at this point in the history
* superset-annotations: (27 commits)
  [stable/superset] Bump version to 0.1.3
  [stable/superset] Add service annotations support
  [stable/drupal] Fix chart not being upgradable (helm#7825)
  [stable/parse] Fix chart not being upgradable (helm#7824)
  [stable/jasperreports] Fix chart not being upgradable (helm#7818)
  [stable/osclass] Fix chart not being upgradable (helm#7817)
  [stable/phpbb] Fix chart not being upgradable (helm#7820)
  [stable/ghost] Fix chart not being upgradable (helm#7814)
  [stable/suitecrm] Fix chart not being upgradable (helm#7816)
  [stable/phpmyadmin] Fix chart not being upgradable (helm#7830)
  [stable/magento] Release 2.0.6 (helm#7810)
  [stable/wordpress] Fix chart not being upgradable (helm#7831)
  [stable/mongodb] Use .Values.existingSecret for standalone deployments (helm#7839)
  [incubator/kafka]: add reassignPartitions to topic configuration (helm#7623)
  Changed syntax error in custom-metrics-apiserver-service and secret (label to labels) (helm#7295)
  [stable/spinnaker] Changing email of dwardu89 (helm#7838)
  fix: mongo init issues (helm#7772)
  [stable/mattemost-team-edition] Add initial charts for Mattermost Team Edition (helm#5987)
  Fixed TLS Ingress, updated mongo dep requirements and app to latest version (helm#7636)
  Adding dwardu89 to owners and chart maintainers of stable/spinnaker (helm#7751)
  ...
  • Loading branch information
legal90 committed Sep 20, 2018
2 parents 673963a + 31dde22 commit da753e7
Show file tree
Hide file tree
Showing 91 changed files with 1,153 additions and 73 deletions.
2 changes: 1 addition & 1 deletion incubator/kafka/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
description: Apache Kafka is publish-subscribe messaging rethought as a distributed
commit log.
name: kafka
version: 0.9.6
version: 0.10.0
appVersion: 4.1.2
keywords:
- kafka
Expand Down
2 changes: 1 addition & 1 deletion incubator/kafka/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ following configurable parameters:
| `prometheus.operator.enabled` | True if using the Prometheus Operator, False if not | `false` |
| `prometheus.operator.serviceMonitor.namespace` | Namespace which Prometheus is running in. Default to kube-prometheus install. | `monitoring` |
| `prometheus.operator.serviceMonitor.selector` | Default to kube-prometheus install (CoreOS recommended), but should be set according to Prometheus install | `{ prometheus: kube-prometheus }` |
| `topics` | List of topics to create & configure. Can specify name, partitions, replicationFactor, config. See values.yaml | `[]` (Empty list) |
| `topics` | List of topics to create & configure. Can specify name, partitions, replicationFactor, reassignPartitions, config. See values.yaml | `[]` (Empty list) |
| `zookeeper.enabled` | If True, installs Zookeeper Chart | `true` |
| `zookeeper.resources` | Zookeeper resource requests and limits | `{}` |
| `zookeeper.env` | Environmental variables provided to Zookeeper Zookeeper | `{ZK_HEAP_SIZE: "1G"}` |
Expand Down
14 changes: 13 additions & 1 deletion incubator/kafka/templates/configmap-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,19 @@ data:
done
echo "Applying runtime configuration using {{ .Values.image }}:{{ .Values.imageTag }}"
{{- range $n, $topic := .Values.topics }}
{{- if and $topic.partitions $topic.replicationFactor }}
{{- if and $topic.partitions $topic.replicationFactor $topic.reassignPartitions }}
cat << EOF > {{ $topic.name }}-increase-replication-factor.json
{"version":1, "partitions":[
{{- $partitions := (int $topic.partitions) }}
{{- $replicas := (int $topic.replicationFactor) }}
{{- range $i := until $partitions }}
{"topic":"{{ $topic.name }}","partition":{{ $i }},"replicas":[{{- range $j := until $replicas }}{{ $j }}{{- if ne $j (sub $replicas 1) }},{{- end }}{{- end }}]}{{- if ne $i (sub $partitions 1) }},{{- end }}
{{- end }}
]}
EOF
kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --execute
kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --verify
{{- else if and $topic.partitions $topic.replicationFactor }}
kafka-topics --zookeeper {{ $zk }} --create --if-not-exists --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} --replication-factor {{ $topic.replicationFactor }}
{{- else if $topic.partitions }}
kafka-topics --zookeeper {{ $zk }} --alter --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} || true
Expand Down
8 changes: 8 additions & 0 deletions incubator/kafka/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -311,16 +311,24 @@ prometheus:
## Topic creation and configuration.
## The job will be run on a deployment only when the config has been changed.
## - If 'partitions' and 'replicationFactor' are specified we create the topic (with --if-not-exists.)
## - If 'partitions', 'replicationFactor' and 'reassignPartitions' are specified we reassign the partitions to
## increase the replication factor of an existing topic.
## - If 'partitions' is specified we 'alter' the number of partitions. This will
## silently and safely fail if the new setting isn’t strictly larger than the old (i.e. a NOOP.) Do be aware of the
## implications for keyed topics (ref: https://docs.confluent.io/current/kafka/post-deployment.html#admin-operations)
## - If 'defaultConfig' is specified it's deleted from the topic configuration. If it isn't present,
## it will silently and safely fail.
## - If 'config' is specified it's added to the topic configuration.
##
## Note: To increase the 'replicationFactor' of a topic, 'reassignPartitions' must be set to true (see above).
##
topics: []
# - name: myExistingTopicConfig
# config: "cleanup.policy=compact,delete.retention.ms=604800000"
# - name: myExistingTopicReassignPartitions
# partitions: 8
# replicationFactor: 5
# reassignPartitions: true
# - name: myExistingTopicPartitions
# partitions: 8
# - name: myNewTopicWithConfig
Expand Down
2 changes: 1 addition & 1 deletion stable/coredns/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: coredns
version: 1.0.1
version: 1.1.0
appVersion: 1.2.0
description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services
keywords:
Expand Down
4 changes: 4 additions & 0 deletions stable/coredns/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ spec:
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
containers:
- name: "coredns"
Expand Down
4 changes: 4 additions & 0 deletions stable/coredns/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ servers:
# - master
affinity: {}

# Node labels for pod assignment
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
nodeSelector: {}

# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#toleration-v1-core
# for example:
# tolerations:
Expand Down
2 changes: 1 addition & 1 deletion stable/drupal/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: drupal
version: 1.1.4
version: 2.0.0
appVersion: 8.6.1
description: One of the most versatile open source content management systems.
keywords:
Expand Down
12 changes: 12 additions & 0 deletions stable/drupal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,15 @@ $ helm install --name my-release --set persistence.drupal.existingClaim=PVC_NAME

This will mount the `drupal-data` volume into the `hostPath` directory. The site data will be persisted if the mount path contains valid data, else the site data will be initialized at first launch.
1. Because the container cannot control the host machine’s directory permissions, you must set the Drupal file directory permissions yourself and disable or clear Drupal cache. See Drupal Core’s [INSTALL.txt](http://cgit.drupalcode.org/drupal/tree/core/INSTALL.txt?h=8.3.x#n152) for setting file permissions, and see [Drupal handbook page](https://www.drupal.org/node/2598914) to disable the cache, or [Drush handbook](https://drushcommands.com/drush-8x/cache/cache-rebuild/) to clear cache.

## Upgrading

### To 2.0.0

Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments.
Use the workaround below to upgrade from versions previous to 2.0.0. The following example assumes that the release name is drupal:
```console
$ kubectl patch deployment drupal-drupal --type=json -p='[{"op": "remove", "path": "/spec/selector/matchLabels/chart"}]'
$ kubectl delete statefulset drupal-mariadb --cascade=false
```
4 changes: 4 additions & 0 deletions stable/drupal/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ metadata:
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
selector:
matchLabels:
app: {{ template "drupal.fullname" . }}
release: "{{ .Release.Name }}"
replicas: 1
template:
metadata:
Expand Down
4 changes: 2 additions & 2 deletions stable/ghost/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: ghost
version: 4.0.20
appVersion: 2.1.2
version: 5.0.0
appVersion: 2.1.3
description: A simple, powerful publishing platform that allows you to share your
stories with the world
keywords:
Expand Down
12 changes: 12 additions & 0 deletions stable/ghost/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,15 @@ The [Bitnami Ghost](https://github.com/bitnami/bitnami-docker-ghost) image store
Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
See the [Configuration](#configuration) section to configure the PVC or to disable persistence.
## Upgrading
### To 5.0.0
Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments.
Use the workaround below to upgrade from versions previous to 5.0.0. The following example assumes that the release name is ghost:
```console
$ kubectl patch deployment ghost-ghost --type=json -p='[{"op": "remove", "path": "/spec/selector/matchLabels/chart"}]'
$ kubectl delete statefulset ghost-mariadb --cascade=false
```
4 changes: 2 additions & 2 deletions stable/ghost/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 4.4.1
version: 4.4.2
digest: sha256:8a53e73537f5a2d9073c3b1173b9c6b814c2baeb2e8e31485e2ad52172c0b296
generated: 2018-09-11T16:28:26.460468115Z
generated: 2018-09-18T16:36:42.65396776Z
4 changes: 4 additions & 0 deletions stable/ghost/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ metadata:
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
selector:
matchLabels:
app: {{ template "ghost.fullname" . }}
release: "{{ .Release.Name }}"
replicas: 1
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion stable/ghost/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
image:
registry: docker.io
repository: bitnami/ghost
tag: 2.1.2-debian-9
tag: 2.1.3-debian-9
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
2 changes: 1 addition & 1 deletion stable/jasperreports/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: jasperreports
version: 2.0.4
version: 3.0.0
appVersion: 7.1.0
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,
Expand Down
11 changes: 11 additions & 0 deletions stable/jasperreports/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,14 @@ The [Bitnami JasperReports](https://github.com/bitnami/bitnami-docker-jasperrepo

Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
See the [Configuration](#configuration) section to configure the PVC or to disable persistence.

## Upgrading

### To 3.0.0

Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments.
Use the workaround below to upgrade from versions previous to 3.0.0. The following example assumes that the release name is jasperreports:

```console
$ kubectl patch deployment jasperreports-jasperreports --type=json -p='[{"op": "remove", "path": "/spec/selector/matchLabels/chart"}]'
$ kubectl delete statefulset jasperreports-mariadb --cascade=false
4 changes: 4 additions & 0 deletions stable/jasperreports/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ metadata:
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
selector:
matchLabels:
app: {{ template "jasperreports.fullname" . }}
release: "{{ .Release.Name }}"
template:
metadata:
labels:
Expand Down
4 changes: 2 additions & 2 deletions stable/kapacitor/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: kapacitor
version: 1.0.0
appVersion: 1.6.2
version: 1.1.0
appVersion: 1.5.1
description: InfluxDB's native data processing engine. It can process both stream
and batch data from InfluxDB.
keywords:
Expand Down
4 changes: 2 additions & 2 deletions stable/kapacitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## An Open-Source Time Series ETL and Alerting Engine

[Kapacitor](https://github.com/influxdata/kapacitor) is an open-source framework built by the folks over at [InfluxData](https://influxdata.com) and written in Go for processing, monitoring, and alerting on time series data
[Kapacitor](https://github.com/influxdata/kapacitor) is an open-source framework built by the folks over at [InfluxData](https://influxdata.com) and written in Go for processing, monitoring, and alerting on time series data

## QuickStart

Expand Down Expand Up @@ -48,7 +48,7 @@ The following table lists the configurable parameters of the Kapacitor chart and
| Parameter | Description | Default |
| ----------------------- | ---------------------------------- | ---------------------------------------------------------- |
| `image.repository` | Kapacitor image | `kapacitor` |
| `image.tag` | Kapacitor image version | `1.6.2-alpine` |
| `image.tag` | Kapacitor image version | `1.5.1-alpine` |
| `image.pullPolicy` | Kapacitor image pull policy | `IfNotPresent` |
| `service.type` | Kapacitor web service type | `ClusterIP` |
| `persistence.enabled` | Enable Kapacitor persistence using Persistent Volume Claims | `false` |
Expand Down
2 changes: 1 addition & 1 deletion stable/kapacitor/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##
image:
repository: "kapacitor"
tag: "1.6.2-alpine"
tag: "1.5.1-alpine"
pullPolicy: "IfNotPresent"

## Specify a service type, defaults to NodePort
Expand Down
2 changes: 1 addition & 1 deletion stable/kibana/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: kibana
version: 0.13.1
version: 0.14.1
appVersion: 6.4.0
description: Kibana is an open source data visualization plugin for Elasticsearch
icon: https://raw.githubusercontent.com/elastic/kibana/master/src/ui/public/icons/kibana-color.svg
Expand Down
3 changes: 2 additions & 1 deletion stable/kibana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,15 @@ The following table lists the configurable parameters of the kibana chart and th
| `dashboardImport.xpackauth.username` | Optional Xpack username | `myuser` |
| `dashboardImport.xpackauth.password` | Optional Xpack password | `mypass` |
| `dashboardImport.dashboards` | Dashboards | `{}` |
| `plugins` | List of URLs pointing to zip files of Kibana plugins to install | None: |



Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

* The Kibana configuration files config properties can be set through the `env` parameter too.
* All the files listed under this variable will overwrite any existing files by the same name in kibana config directory.
* Files not mentioned under this variable will remain unaffected.
* Files not mentioned under this variable will remain unaffected.

```console
$ helm install stable/kibana --name my-release \
Expand Down
38 changes: 37 additions & 1 deletion stable/kibana/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ spec:
{{- if .Values.priorityClassName }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
{{- if .Values.dashboardImport.dashboards }}
{{- if or (.Values.dashboardImport.dashboards) (.Values.plugins) }}
initContainers:
{{- if .Values.dashboardImport.dashboards }}
- name: {{ .Chart.Name }}-dashboardimport
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
Expand Down Expand Up @@ -58,6 +59,41 @@ spec:
mountPath: "/usr/share/kibana/config/{{ $configFile }}"
subPath: {{ $configFile }}
{{- end }}
{{- end }}
{{- if .Values.plugins}}
- name: {{ .Chart.Name }}-plugins-install
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- /bin/bash
- "-c"
- |
set -e
plugins=(
{{- range .Values.plugins }}
{{ . }}
{{- end }}
)
for i in "${plugins[@]}"
do
./bin/kibana-plugin install $i
done
env:
{{- range $key, $value := .Values.env }}
- name: "{{ $key }}"
value: "{{ $value }}"
{{- end }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ template "kibana.name" . }}
protocol: TCP
volumeMounts:
{{- range $configFile := (keys .Values.files) }}
- name: {{ template "kibana.name" $ }}
mountPath: "/usr/share/kibana/config/{{ $configFile }}"
subPath: {{ $configFile }}
{{- end }}
{{- end }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
Expand Down
5 changes: 5 additions & 0 deletions stable/kibana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,8 @@ dashboardImport:
username: myuser
password: mypass
dashboards: {}

# List of pluginns to install using initContainer
plugins:
# - https://github.com/sivasamyk/logtrail/releases/download/v0.1.29/logtrail-6.4.0-0.1.29.zip
# - other_plugin
4 changes: 2 additions & 2 deletions stable/magento/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: magento
version: 2.0.5
appVersion: 2.2.5
version: 2.0.6
appVersion: 2.2.6
description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more.
keywords:
- magento
Expand Down
4 changes: 2 additions & 2 deletions stable/magento/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 4.3.1
version: 4.4.2
digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1
generated: 2018-08-01T14:16:06.145545926+02:00
generated: 2018-09-19T08:55:16.161228356Z
2 changes: 1 addition & 1 deletion stable/magento/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
image:
registry: docker.io
repository: bitnami/magento
tag: 2.2.5-debian-9
tag: 2.2.6-debian-9
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
24 changes: 24 additions & 0 deletions stable/mattermost-team-edition/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj

# OWNERS file for Kubernetes
OWNERS
Loading

0 comments on commit da753e7

Please sign in to comment.