[GitHub] rabbah closed pull request #157: update runtimes.json for OW#3259

[GitBox <gi...@apache.org>]

rabbah closed pull request #157: update runtimes.json for OW#3259
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/157
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/docker/docker-pull/pull_images.yml b/docker/docker-pull/pull_images.yml
index 2e1a3f8..05510b6 100644
--- a/docker/docker-pull/pull_images.yml
+++ b/docker/docker-pull/pull_images.yml
@@ -8,6 +8,10 @@
     docker_pull_delay: 10
     docker_registry:
     runtimesManifest: "{{ lookup('env', 'RUNTIMES_MANIFEST') | from_json }}"
+    dip: "{{ lookup('env', 'DEFAULT_IMAGE_PREFIX') }}"
+    defaultImagePrefix: "{{ dip if dip != '' else 'openwhisk'}}"
+    dit: "{{ lookup('env', 'DEFAULT_IMAGE_TAG') }}"
+    defaultImageTag: "{{ dit if dit != '' else 'latest' }}"
 
   tasks:
     - name: docker login
@@ -17,15 +21,15 @@
         password: "{{ docker_registry_password }}"
       when: docker_registry != "" and docker_registry_password is defined
 
-    - name: "pull runtime action images with tag {{runtimesManifest.defaultImageTag}}"
-      shell: "docker pull {{docker_registry}}{{runtimesManifest.defaultImagePrefix}}/{{item}}:{{runtimesManifest.defaultImageTag}}"
+    - name: "pull runtime action images with tag {{defaultImageTag}}"
+      shell: "docker pull {{docker_registry}}{{defaultImagePrefix}}/{{item}}:{{defaultImageTag}}"
       with_items: "{{ runtimesManifest.runtimes.values() | sum(start=[]) | selectattr('deprecated', 'equalto',false)  | map(attribute='image.name') | list | unique }}"
       when: docker_registry != ""
       retries: "{{ docker_pull_retries }}"
       delay: "{{ docker_pull_delay }}"
 
-    - name: "pull blackboxes action images with tag {{runtimesManifest.defaultImageTag}}"
-      shell: "docker pull {{docker_registry}}{{runtimesManifest.defaultImagePrefix}}/{{item.name}}:{{runtimesManifest.defaultImageTag}}"
+    - name: "pull blackboxes action images with tag {{defaultImageTag}}"
+      shell: "docker pull {{docker_registry}}{{defaultImagePrefix}}/{{item.name}}:{{defaultImageTag}}"
       with_items:
         - "{{ runtimesManifest.blackboxes }}"
       when: docker_registry != ""
diff --git a/kubernetes/cluster-setup/runtimes.json b/kubernetes/cluster-setup/runtimes.json
index 8030fa2..42858d6 100644
--- a/kubernetes/cluster-setup/runtimes.json
+++ b/kubernetes/cluster-setup/runtimes.json
@@ -1,7 +1,4 @@
 {
-    "bypassPullForLocalImages": false,
-    "defaultImagePrefix": "openwhisk",
-    "defaultImageTag": "latest",
     "runtimes": {
         "nodejs": [
             {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services