From d30adc3c222494ba557a9ba2cbe58d3762f90bb5 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Thu, 14 Mar 2019 17:26:55 +0000 Subject: [PATCH 1/2] bitnami/tensorflow-resnet: update to 1.13.0 Signed-off-by: Bitnami Containers --- bitnami/tensorflow-resnet/Chart.yaml | 4 ++-- bitnami/tensorflow-resnet/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/tensorflow-resnet/Chart.yaml b/bitnami/tensorflow-resnet/Chart.yaml index f05552313..8c9c65a2a 100755 --- a/bitnami/tensorflow-resnet/Chart.yaml +++ b/bitnami/tensorflow-resnet/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: tensorflow-resnet -version: 0.1.0 -appVersion: 1.12.0 +version: 0.1.1 +appVersion: 1.13.0 description: Open-source software library serving the ResNet machine learning model. keywords: - tensorflow diff --git a/bitnami/tensorflow-resnet/values.yaml b/bitnami/tensorflow-resnet/values.yaml index 248b57749..b27f7e74c 100755 --- a/bitnami/tensorflow-resnet/values.yaml +++ b/bitnami/tensorflow-resnet/values.yaml @@ -16,7 +16,7 @@ server: image: registry: docker.io repository: bitnami/tensorflow-serving - tag: 1.12.0 + tag: 1.13.0 ## 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 @@ -37,7 +37,7 @@ client: image: registry: docker.io repository: bitnami/tensorflow-resnet - tag: 1.12.0 + tag: 1.13.0 ## 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 From b4d37d0cbd2593a72f4937cd840ad09378857aad Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 14 Mar 2019 18:37:30 +0000 Subject: [PATCH 2/2] Synchronize upstreamed folder to 5947b8fb5 --- upstreamed/kubewatch/Chart.yaml | 2 +- upstreamed/kubewatch/README.md | 1 + upstreamed/kubewatch/templates/_helpers.tpl | 29 +++++++++++++++++++ .../kubewatch/templates/deployment.yaml | 1 + upstreamed/kubewatch/values.yaml | 15 ++++++++-- upstreamed/rabbitmq/Chart.yaml | 2 +- upstreamed/rabbitmq/README.md | 2 +- 7 files changed, 46 insertions(+), 6 deletions(-) diff --git a/upstreamed/kubewatch/Chart.yaml b/upstreamed/kubewatch/Chart.yaml index 754063038..d0103eaeb 100644 --- a/upstreamed/kubewatch/Chart.yaml +++ b/upstreamed/kubewatch/Chart.yaml @@ -1,5 +1,5 @@ name: kubewatch -version: 0.6.1 +version: 0.7.0 apiVersion: v1 appVersion: 0.0.4 home: https://github.com/bitnami-labs/kubewatch diff --git a/upstreamed/kubewatch/README.md b/upstreamed/kubewatch/README.md index 1eb07b62f..7b22bd62b 100644 --- a/upstreamed/kubewatch/README.md +++ b/upstreamed/kubewatch/README.md @@ -40,6 +40,7 @@ The following table lists the configurable parameters of the kubewatch chart and | Parameter | Description | Default | | ---------------------------------------- | ------------------------------------ | --------------------------------- | | `global.imageRegistry` | Global Docker image registry | `nil` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `affinity` | node/pod affinities | None | | `image.registry` | Image registry | `docker.io` | | `image.repository` | Image repository | `bitnami/kubewatch` | diff --git a/upstreamed/kubewatch/templates/_helpers.tpl b/upstreamed/kubewatch/templates/_helpers.tpl index baf5c90e4..357b50b84 100644 --- a/upstreamed/kubewatch/templates/_helpers.tpl +++ b/upstreamed/kubewatch/templates/_helpers.tpl @@ -64,3 +64,32 @@ Also, we can't use a single if because lazy evaluation is not an option {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} {{- end -}} {{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "kubewatch.imagePullSecrets" -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic. +Also, we can not use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} +{{- if .Values.global.imagePullSecrets }} +imagePullSecrets: +{{- range .Values.global.imagePullSecrets }} + - name: {{ . }} +{{- end }} +{{- else if .Values.image.pullSecrets }} +imagePullSecrets: +{{- range .Values.image.pullSecrets }} + - name: {{ . }} +{{- end }} +{{- end -}} +{{- else if .Values.image.pullSecrets }} +imagePullSecrets: +{{- range .Values.image.pullSecrets }} + - name: {{ . }} +{{- end }} +{{- end -}} +{{- end -}} diff --git a/upstreamed/kubewatch/templates/deployment.yaml b/upstreamed/kubewatch/templates/deployment.yaml index d95be8622..56cfe68a1 100644 --- a/upstreamed/kubewatch/templates/deployment.yaml +++ b/upstreamed/kubewatch/templates/deployment.yaml @@ -28,6 +28,7 @@ spec: {{ toYaml .Values.podLabels | indent 8 }} {{- end }} spec: +{{- include "kubewatch.imagePullSecrets" . | indent 6 }} containers: - name: {{ template "kubewatch.name" . }} image: {{ template "kubewatch.image" . }} diff --git a/upstreamed/kubewatch/values.yaml b/upstreamed/kubewatch/values.yaml index 0eff9f7d8..e76cdd328 100644 --- a/upstreamed/kubewatch/values.yaml +++ b/upstreamed/kubewatch/values.yaml @@ -1,8 +1,11 @@ -## Global Docker image registry -## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value +## Global Docker image parameters +## Please, note that this will override the image parameters, including dependencies, configured to use the global value +## Current available global Docker image parameters: imageRegistry and imagePullSecrets ## # global: -# imageRegistry: +# imageRegistry: myRegistryName +# imagePullSecrets: +# - myRegistryKeySecretName slack: enabled: true @@ -45,6 +48,12 @@ image: repository: "bitnami/kubewatch" tag: "0.0.4" pullPolicy: "Always" + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - myRegistryKeySecretName rbac: # If true, create & use RBAC resources diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index c89888992..01025ea08 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 4.7.0 +version: 4.7.1 appVersion: 3.7.13 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md index f55223983..0281d1db8 100644 --- a/upstreamed/rabbitmq/README.md +++ b/upstreamed/rabbitmq/README.md @@ -60,7 +60,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `rabbitmq.password` | RabbitMQ application password | _random 10 character long alphanumeric string_ | | `rabbitmq.existingPasswordSecret` | Existing secret with RabbitMQ credentials | nil | | `rabbitmq.erlangCookie` | Erlang cookie | _random 32 character long alphanumeric string_ | -| `rabbitmq.existingErlSecret` | Existing secret with RabbitMQ Erlang cookie | nil | +| `rabbitmq.existingErlangSecret` | Existing secret with RabbitMQ Erlang cookie | nil | | `rabbitmq.plugins` | configuration file for plugins to enable | `[rabbitmq_management,rabbitmq_peer_discovery_k8s].` | | `rabbitmq.clustering.address_type` | Switch clustering mode | `ip` or `hostname` | | `rabbitmq.clustering.k8s_domain` | Customize internal k8s cluster domain | `cluster.local` |