Use separate registry key for docker images (#410)

stashed · Apr 3, 2018 · af50930 · af50930
1 parent c59e3fb
commit af50930
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 15 deletions.
diff --git a/chart/stable/stash/Chart.yaml b/chart/stable/stash/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: 'Stash by AppsCode - Backup your Kubernetes Volumes'
 name: stash
-version: 0.5.1
+version: 0.6.0
 appVersion: 0.7.0-rc.3
 home: https://github.com/appscode/stash
 icon: https://cdn.appscode.com/images/icon/stash.png

diff --git a/chart/stable/stash/README.md b/chart/stable/stash/README.md
@@ -40,12 +40,13 @@ The following table lists the configurable parameters of the Stash chart and the
 
 | Parameter                           | Description                                                       | Default            |
 | ----------------------------------- | ----------------------------------------------------------------- | ------------------ |
-| `dockerRegistry`                    | Docker registry used to pull Stash related images                 | `appscode`         |
 | `replicaCount`                      | Number of stash operator replicas to create (only 1 is supported) | `1`                |
-| `operator.image`                    | operator container image                                          | `appscode/stash`   |
+| `operator.registry`                 | Docker registry used to pull operator image                       | `appscode`         |
+| `operator.repository`               | operator container image                                          | `stash`            |
 | `operator.tag`                      | operator container image tag                                      | `0.7.0-rc.3`       |
 | `operator.pullPolicy`               | operator container image pull policy                              | `IfNotPresent`     |
-| `pushgateway.image`                 | Prometheus pushgateway container image                            | `prom/pushgateway` |
+| `pushgateway.registry`              | Docker registry used to pull Prometheus pushgateway image         | `prom`             |
+| `pushgateway.repository`            | Prometheus pushgateway container image                            | `pushgateway`      |
 | `pushgateway.tag`                   | Prometheus pushgateway container image tag                        | `v0.4.0`           |
 | `pushgateway.pullPolicy`            | Prometheus pushgateway container image pull policy                | `IfNotPresent`     |
 | `criticalAddon`                     | If true, installs Stash operator as critical addon                | `false`            |
@@ -77,7 +78,7 @@ By default the chart will not install the recommended RBAC roles and rolebinding
 
 You need to have the flag `--authorization-mode=RBAC` on the api server. See the following document for how to enable [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/).
 
-To determine if your cluster supports RBAC, run the the following command:
+To determine if your cluster supports RBAC, run the following command:
 
 ```console
 $ kubectl api-versions | grep rbac

diff --git a/chart/stable/stash/templates/deployment.yaml b/chart/stable/stash/templates/deployment.yaml
@@ -30,13 +30,13 @@ spec:
       {{- end }}
       containers:
       - name: operator
-        image: {{ .Values.operator.image }}:{{ .Values.operator.tag }}
-        imagePullPolicy: {{ .Values.imagePullPolicy  }}
+        image: {{ .Values.operator.registry }}/{{ .Values.operator.repository }}:{{ .Values.operator.tag }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
         args:
         - run
         - --v=3
         - --rbac={{ .Values.rbac.create }}
-        - --docker-registry={{ .Values.dockerRegistry }}
+        - --docker-registry={{ .Values.operator.registry }}
         - --secure-port=8443
         - --audit-log-path=-
         - --tls-cert-file=/var/serving-cert/tls.crt
@@ -54,7 +54,7 @@ spec:
         - mountPath: /var/serving-cert
           name: serving-cert
       - name: pushgateway
-        image: '{{ .Values.pushgateway.image }}:{{ .Values.pushgateway.tag }}'
+        image: '{{ .Values.pushgateway.registry }}/{{ .Values.pushgateway.repository }}:{{ .Values.pushgateway.tag }}'
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         args:
         - -web.listen-address=:56789

diff --git a/chart/stable/stash/values.yaml b/chart/stable/stash/values.yaml
@@ -3,12 +3,13 @@
 # Declare variables to be passed into your templates.
 replicaCount: 1
 # Docker registry containing Stash images
-dockerRegistry: appscode
 operator:
-  image: appscode/stash
+  registry: appscode
+  repository: stash
   tag: 0.7.0-rc.3
 pushgateway:
-  image: prom/pushgateway
+  registry: prom
+  repository: pushgateway
   tag: v0.4.0
 ## Optionally specify an array of imagePullSecrets.
 ## Secrets must be manually created in the namespace.

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -17,8 +17,37 @@ aliases:
 
 # Change Log
 
-## [0.7.0-rc.3](https://github.com/appscode/stash/tree/0.7.0-rc.3) (2018-03-24)
-[Full Changelog](https://github.com/appscode/stash/compare/0.7.0-rc.1...0.7.0-rc.3)
+## [Unreleased](https://github.com/appscode/stash/tree/HEAD)
+
+[Full Changelog](https://github.com/appscode/stash/compare/0.7.0-rc.2...HEAD)
+
+**Fixed bugs:**
+
+- Pod restart after each backup when Mutating Webhook enabled [\#396](https://github.com/appscode/stash/issues/396)
+- Sidecar RoleBinding is not being created when Mutating Webhook is enabled  [\#395](https://github.com/appscode/stash/issues/395)
+- Recovery to PVC restores data in subdirectory instead of root directory [\#392](https://github.com/appscode/stash/issues/392)
+- Revendor webhook util and jsonpatch fixes [\#400](https://github.com/appscode/stash/pull/400) ([tamalsaha](https://github.com/tamalsaha))
+
+**Closed issues:**
+
+- hack/deploy/stash.sh: $? check does not work with set -e [\#403](https://github.com/appscode/stash/issues/403)
+
+**Merged pull requests:**
+
+- Prepare docs for 0.7.0-rc.3 [\#411](https://github.com/appscode/stash/pull/411) ([tamalsaha](https://github.com/tamalsaha))
+- Add test for recovery [\#409](https://github.com/appscode/stash/pull/409) ([emruz-hossain](https://github.com/emruz-hossain))
+- Skip setting ListKind [\#407](https://github.com/appscode/stash/pull/407) ([tamalsaha](https://github.com/tamalsaha))
+- Add CRD Validation [\#406](https://github.com/appscode/stash/pull/406) ([tamalsaha](https://github.com/tamalsaha))
+- Generate openapi spec for stash api [\#405](https://github.com/appscode/stash/pull/405) ([tamalsaha](https://github.com/tamalsaha))
+- Fix install script for minikube 0.24.x \(Kube 1.8.0\) [\#404](https://github.com/appscode/stash/pull/404) ([tamalsaha](https://github.com/tamalsaha))
+- Skip downloading onessl if already installed [\#401](https://github.com/appscode/stash/pull/401) ([tamalsaha](https://github.com/tamalsaha))
+- Use Restic spec hash instead of resource version to restart pods [\#399](https://github.com/appscode/stash/pull/399) ([tamalsaha](https://github.com/tamalsaha))
+- Check for valid owner object [\#397](https://github.com/appscode/stash/pull/397) ([tamalsaha](https://github.com/tamalsaha))
+- Create repository crd for each Restic repository [\#394](https://github.com/appscode/stash/pull/394) ([emruz-hossain](https://github.com/emruz-hossain))
+- Revendor webhook library [\#393](https://github.com/appscode/stash/pull/393) ([tamalsaha](https://github.com/tamalsaha))
+
+## [0.7.0-rc.2](https://github.com/appscode/stash/tree/0.7.0-rc.2) (2018-03-24)
+[Full Changelog](https://github.com/appscode/stash/compare/0.7.0-rc.1...0.7.0-rc.2)
 
 **Fixed bugs:**
 
@@ -27,7 +56,7 @@ aliases:
 
 **Merged pull requests:**
 
-- Prepare docs for 0.7.0-rc.3 [\#391](https://github.com/appscode/stash/pull/391) ([tamalsaha](https://github.com/tamalsaha))
+- Prepare docs for 0.7.0-rc.2 [\#391](https://github.com/appscode/stash/pull/391) ([tamalsaha](https://github.com/tamalsaha))
 - Add variable for dockerRegistry [\#390](https://github.com/appscode/stash/pull/390) ([tamalsaha](https://github.com/tamalsaha))
 - Reorg objects deleted in uninstall command [\#389](https://github.com/appscode/stash/pull/389) ([tamalsaha](https://github.com/tamalsaha))
 - Fix Statefulset Example [\#385](https://github.com/appscode/stash/pull/385) ([rodrigozc](https://github.com/rodrigozc))