bump docker registry to v1.6.1

charts/docker-registry/latest/Chart.yaml

 apiVersion: v1
 description: A Helm chart for Docker Registry
 name: docker-registry
-version: 1.5.3
+version: 1.6.1
 appVersion: 2.6.2
 home: https://hub.docker.com/_/registry/
-icon: https://camo.githubusercontent.com/1e11d429705bf6695b79d24966cb1267c00b7df6/68747470733a2f2f7777772e646f636b65722e636f6d2f73697465732f64656661756c742f66696c65732f6f79737465722d72656769737472792d332e706e67
+icon: file://../logo.png
 sources:
   - https://github.com/docker/distribution-library-image
 maintainers:

charts/docker-registry/latest/README.md

-# Docker Registry Helm Chart
-
-This directory contains a Kubernetes chart to deploy a private Docker Registry.
-
-## Prerequisites Details
-
-* PV support on underlying infrastructure (if persistence is required)
-
-## Chart Details
-
-This chart will do the following:
-
-* Implement a Docker registry deployment
-
-## Installing the Chart
-
-To install the chart, use the following:
-
-```console
-$ helm install stable/docker-registry
-```
-
 ## Configuration
 
 The following table lists the configurable parameters of the docker-registry chart and
@@ -63,6 +41,11 @@ their default values.
 | `swift.container`           | Swift container                                                                            | `nil`           |
 | `nodeSelector`              | node labels for pod assignment                                                             | `{}`            |
 | `tolerations`               | pod tolerations                                                                            | `[]`            |
+| `ingress.enabled`           | If true, Ingress will be created                                                           | `false`         |
+| `ingress.annotations`       | Ingress annotations                                                                        | `{}`            |
+| `ingress.path`              | Ingress service path                                                                       | `/`            |
+| `ingress.hosts`             | Ingress hostnames                                                                          | `[]`            |
+| `ingress.tls`               | Ingress TLS configuration (YAML)                                                           | `[]`            |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to
 `helm install`.

charts/docker-registry/latest/app-readme.md

+# Docker Registry Helm Chart
+
+This directory contains a Kubernetes chart to deploy a private Docker Registry.

charts/docker-registry/latest/questions.yml

 questions:
+- variable: secret.htpasswd
+  default: ""
+  description: "Htpasswd authentication containing your user:pass associations"
+  type: password
+  label: Docker Registry Htpasswd Authentication
+  group: "Secret Settings"
+- variable: storage
+  default: "filesystem"
+  description: "Storage system to use"
+  type: enum
+  label: Storage System
+  required: true
+  options:
+    - "filesystem"
+    - "s3"
+    - "azure"
+    - "swift"
+  group: "Storage System Settings"
+# s3 storage config
+- variable: s3.region
+  default: "us-east-1"
+  description: "S3 region"
+  type: string
+  label: S3 Region
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=s3"
+- variable: s3.bucket
+  default: ""
+  description: "S3 bucket name"
+  type: string
+  label: S3 Bucket Name
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=s3"
+- variable: secret.s3.accessKey
+  default: ""
+  description: "Access Key for S3 configuration	"
+  type: string
+  label: AWS S3 AccessKey
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=s3"
+- variable: secret.s3.secretKey
+  default: ""
+  description: "Secret Key for S3 configuration	"
+  type: password
+  label: AWS S3 SecretKey
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=s3"
+- variable: s3.encrypt
+  default: false
+  description: "Store images in encrypted format"
+  type: boolean
+  label: S3 Encrypted
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=s3"
+- variable: s3.secure
+  default: true
+  description: "Use HTTPS"
+  type: boolean
+  label: Use HTTPS
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=s3"
+# azure configuration
+- variable: secret.azure.accountName
+  default: ""
+  description: "Azure storage account name"
+  type: string
+  label: Azure Storage Account Name
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=azure"
+- variable: secret.azure.accountKey
+  default: ""
+  description: "Azure storage account key"
+  type: password
+  label: Azure Storage Account Key
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=azure"
+- variable: secret.azure.container
+  default: ""
+  description: "Azure storage container name"
+  type: string
+  label: Azure Storage Container Name
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=azure"
+# swift configuration
+- variable: swift.authurl
+  default: "http://swift.example.com/"
+  description: "Openshift swift authurl"
+  type: string
+  label: Swift Authurl
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=swift"
+- variable: swift.container
+  default: ""
+  description: "Openshift swift container name"
+  type: string
+  label: Swift Container
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=swift"
+- variable: secret.swift.username
+  default: ""
+  description: "Username for Swift configuration"
+  type: string
+  label: Openshift Swift Username
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=swift"
+- variable: secret.swift.password
+  default: ""
+  description: "Password for Swift configuration"
+  type: password
+  label: Openshift Swift Password
+  required: true
+  group: "Storage System Settings"
+  show_if: "storage=swift"
+# persistence setting
 - variable: persistence.enabled
   default: false
   description: "Enable persistent volume for Docker registry"
   type: boolean
-  label: Docker Registry Persistent Volume Enabled
+  label: Persistent Volume Enabled
   show_subquestion_if: true
-  group: "Docker Registry Settings"
+  group: "Persistent Storage"
   subquestions:
   - variable: persistence.size
     default: "10Gi"
@@ -17,6 +143,11 @@ questions:
     description: "If undefined or null, uses the default StorageClass. Default to null"
     type: storageclass
     label: Default StorageClass for Docker Registry
+  - variable: persistence.existingClaim
+    default: ""
+    description: "If not empty, uses the specified existing PVC instead of creating new one"
+    type: pvc
+    label: Uses Existing Persistent Volume Cliam
 - variable: ingress.enabled
   default: false
   description: "Expose app using Layer 7 Load Balancer - ingress"
@@ -26,7 +157,7 @@ questions:
   group: "Services and Load Balancing"
   subquestions:
   - variable: ingress.hosts[0]
-    default: "xip.io"
+    default: ""
     description: "Hostname to your Docker Registry installation"
     type: hostname
     required: true

charts/docker-registry/latest/templates/deployment.yaml

-apiVersion: apps/v1beta1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ template "docker-registry.fullname" . }}
@@ -86,6 +86,22 @@ spec:
 {{- if eq .Values.storage "filesystem" }}
             - name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY
               value: "/var/lib/registry"
+{{- else if eq .Values.storage "azure" }}
+            - name: REGISTRY_STORAGE_AZURE_ACCOUNTNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "docker-registry.fullname" . }}-secret
+                  key: azureAccountName
+            - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "docker-registry.fullname" . }}-secret
+                  key: azureAccountKey
+            - name: REGISTRY_STORAGE_AZURE_CONTAINER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "docker-registry.fullname" . }}-secret
+                  key: azureContainer
 {{- else if eq .Values.storage "s3" }}
             {{- if and .Values.secrets.s3.secretKey .Values.secrets.s3.accessKey }}
             - name: REGISTRY_STORAGE_S3_ACCESSKEY

charts/docker-registry/latest/templates/secret.yaml

@@ -17,7 +17,14 @@ data:
   {{- else }}
   haSharedSecret: {{ randAlphaNum 16 | b64enc | quote }}
   {{- end }}
-  {{- if eq .Values.storage "s3" }}
+
+  {{- if eq .Values.storage "azure" }}
+    {{- if and .Values.secrets.azure.accountName .Values.secrets.azure.accountKey .Values.secrets.azure.container }}
+  azureAccountName: {{ .Values.secrets.azure.accountName | b64enc | quote }}
+  azureAccountKey: {{ .Values.secrets.azure.accountKey | b64enc | quote }}
+  azureContainer: {{ .Values.secrets.azure.container | b64enc | quote }}
+    {{- end }}
+  {{- else if eq .Values.storage "s3" }}
     {{- if and .Values.secrets.s3.secretKey .Values.secrets.s3.accessKey }}
   s3AccessKey: {{ .Values.secrets.s3.accessKey | b64enc | quote }}
   s3SecretKey: {{ .Values.secrets.s3.secretKey | b64enc | quote }}

charts/docker-registry/latest/values.yaml

@@ -64,6 +64,11 @@ storage: filesystem
 secrets:
   haSharedSecret: ""
   htpasswd: ""
+# Secrets for Azure
+#   azure:
+#     accountName: ""
+#     accountKey: ""
+#     container: ""
 # Secrets for S3 access and secret keys
 #   s3:
 #     accessKey: ""