[incubator-openwhisk-deploy-kube] branch master updated: update runtimes.json for OW#3259 (#157)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 6a8ac00  update runtimes.json for OW#3259 (#157)
6a8ac00 is described below

commit 6a8ac00ecda6e18c8f49d716724da8482573b60a
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Tue Feb 13 17:03:55 2018 -0500

    update runtimes.json for OW#3259 (#157)
    
    Upstream PR moved bypassPullForLocalImages, defaultImagePrefix,
    and defaultImageTag from runtimes.json to application.conf.
    Make the same change in the kube copy of runtimes.json.
---
 docker/docker-pull/pull_images.yml     | 12 ++++++++----
 kubernetes/cluster-setup/runtimes.json |  3 ---
 2 files changed, 8 insertions(+), 7 deletions(-)

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": [
             {

-- 
To stop receiving notification emails like this one, please contact
rabbah@apache.org.