From 0279508f37d8a16429d3e5013dd33bb80b5d5146 Mon Sep 17 00:00:00 2001
From: Bastian Eicher <bastian@eicher.net>
Date: Mon, 22 Mar 2021 19:35:25 +0100
Subject: [PATCH] Set default value for `image.registry` to `docker.io`

---
 charts/generic-service/README.md                  | 3 +--
 charts/generic-service/ci/basic-values.yaml       | 1 -
 charts/generic-service/ci/config-values.yaml      | 1 -
 charts/generic-service/ci/ingress-values.yaml     | 1 -
 charts/generic-service/ci/name-values.yaml        | 1 -
 charts/generic-service/ci/persistence-values.yaml | 1 -
 charts/generic-service/values.schema.json         | 2 +-
 charts/generic-service/values.yaml                | 2 +-
 8 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/charts/generic-service/README.md b/charts/generic-service/README.md
index 6956531..da64637 100644
--- a/charts/generic-service/README.md
+++ b/charts/generic-service/README.md
@@ -24,7 +24,6 @@ You can then add static configuration to your `values.yaml` like this:
 ```yaml
 app:
   image:
-    registry: docker.io
     repository: myservice
     tag: 1.2.3
 ```
@@ -35,7 +34,7 @@ app:
 | ----------------------------------------- | -------------------------- | -------------------------------------------------------------------------------------------------------- |
 | `name`                                    | Release Name               | The name of the service (used for `app.kubernetes.io/name` label)                                        |
 | `fullname`                                | Release Name (+ `name`)    | The name of the service instance (used for resource names and `app.kubernetes.io/instance` label)        |
-| `image.registry`                          | __required__               | The Registry containing the Docker Image to run (also used as the name of an optional Image Pull Secret) |
+| `image.registry`                          | `docker.io`                | The Registry containing the Docker Image to run (also used as the name of an optional Image Pull Secret) |
 | `image.repository`                        | __required__               | The name of the Docker Image image to run (without the Registry)                                         |
 | `image.tag`                               | __required__               | The tag of the Docker Image to run (also used for `app.kubernetes.io/version` label)                     |
 | `image.pullPolicy`                        | `IfNotPresent`             | Set to `Always` to try to pull new versions of the Docker Image                                          |
diff --git a/charts/generic-service/ci/basic-values.yaml b/charts/generic-service/ci/basic-values.yaml
index 83aaa94..2678cd6 100644
--- a/charts/generic-service/ci/basic-values.yaml
+++ b/charts/generic-service/ci/basic-values.yaml
@@ -1,6 +1,5 @@
 # Minimal test
 
 image:
-  registry: docker.io
   repository: jwilder/whoami
   tag: latest
diff --git a/charts/generic-service/ci/config-values.yaml b/charts/generic-service/ci/config-values.yaml
index 9613973..b29d128 100644
--- a/charts/generic-service/ci/config-values.yaml
+++ b/charts/generic-service/ci/config-values.yaml
@@ -1,7 +1,6 @@
 # Config and environment variable test
 
 image:
-  registry: docker.io
   repository: jwilder/whoami
   tag: latest
 
diff --git a/charts/generic-service/ci/ingress-values.yaml b/charts/generic-service/ci/ingress-values.yaml
index 6ec8c93..5e7e37a 100644
--- a/charts/generic-service/ci/ingress-values.yaml
+++ b/charts/generic-service/ci/ingress-values.yaml
@@ -1,7 +1,6 @@
 # Ingress test
 
 image:
-  registry: docker.io
   repository: jwilder/whoami
   tag: latest
 
diff --git a/charts/generic-service/ci/name-values.yaml b/charts/generic-service/ci/name-values.yaml
index e7d628f..5e0c5c8 100644
--- a/charts/generic-service/ci/name-values.yaml
+++ b/charts/generic-service/ci/name-values.yaml
@@ -4,6 +4,5 @@ name: test
 fullname: my-test
 
 image:
-  registry: docker.io
   repository: jwilder/whoami
   tag: latest
diff --git a/charts/generic-service/ci/persistence-values.yaml b/charts/generic-service/ci/persistence-values.yaml
index 4e3ade7..b1c0879 100644
--- a/charts/generic-service/ci/persistence-values.yaml
+++ b/charts/generic-service/ci/persistence-values.yaml
@@ -1,7 +1,6 @@
 # Persistence test
 
 image:
-  registry: docker.io
   repository: jwilder/whoami
   tag: latest
 
diff --git a/charts/generic-service/values.schema.json b/charts/generic-service/values.schema.json
index d42b5f1..db955b0 100644
--- a/charts/generic-service/values.schema.json
+++ b/charts/generic-service/values.schema.json
@@ -15,6 +15,7 @@
       "properties": {
         "registry": {
           "type": "string",
+          "default": "docker.io",
           "description": "The Registry containing the Docker Image to run (also used as the name of an optional Image Pull Secret)"
         },
         "repository": {
@@ -33,7 +34,6 @@
         }
       },
       "required": [
-        "registry",
         "repository",
         "tag"
       ]
diff --git a/charts/generic-service/values.yaml b/charts/generic-service/values.yaml
index be94ec7..3d781bd 100644
--- a/charts/generic-service/values.yaml
+++ b/charts/generic-service/values.yaml
@@ -2,7 +2,7 @@ name: ''
 fullname: ''
 
 image:
-  # registry: required
+  registry: docker.io
   # repository: required
   # tag: latest
   pullPolicy: IfNotPresent