Set default value for image.registry to docker.io

nano-byte · Mar 22, 2021 · 0279508 · 0279508
1 parent 58c1a0c
commit 0279508
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@ name: ''
 fullname: ''
 
 image:
-  # registry: required
+  registry: docker.io
   # repository: required
   # tag: latest
   pullPolicy: IfNotPresent