summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-24 14:43:20 -0800
committerGitHub <noreply@github.com>2018-01-24 14:43:20 -0800
commit0905e3ffb267317da5ae743f201438e2aca96f86 (patch)
tree42d2faaddcdce5658f3ab049e02cf53250fddf11
parent941e8ac85e0e92515ca27312d11629bd651da7bd (diff)
parent4fca5efde8ac210b96846a553153a444c13be4fb (diff)
downloadopenshift-0905e3ffb267317da5ae743f201438e2aca96f86.tar.gz
openshift-0905e3ffb267317da5ae743f201438e2aca96f86.tar.bz2
openshift-0905e3ffb267317da5ae743f201438e2aca96f86.tar.xz
openshift-0905e3ffb267317da5ae743f201438e2aca96f86.zip
Merge pull request #6819 from fabianvf/1524805-service-catalog-pull-policy
Automatic merge from submit-queue. Bug 1524805- ServiceCatalog now works disconnected Change imagePullPolicy for service catalog from Always to IfNotPresent, allowing service catalog to install in a disconnected setting https://bugzilla.redhat.com/show_bug.cgi?id=1524805
-rw-r--r--roles/openshift_service_catalog/templates/api_server.j22
-rw-r--r--roles/openshift_service_catalog/templates/controller_manager.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_service_catalog/templates/api_server.j2 b/roles/openshift_service_catalog/templates/api_server.j2
index e345df32c..a18d29ef0 100644
--- a/roles/openshift_service_catalog/templates/api_server.j2
+++ b/roles/openshift_service_catalog/templates/api_server.j2
@@ -49,7 +49,7 @@ spec:
- OriginatingIdentity=true
image: {{ openshift_service_catalog_image_prefix }}service-catalog:{{ openshift_service_catalog_image_version }}
command: ["/usr/bin/service-catalog"]
- imagePullPolicy: Always
+ imagePullPolicy: IfNotPresent
name: apiserver
ports:
- containerPort: 6443
diff --git a/roles/openshift_service_catalog/templates/controller_manager.j2 b/roles/openshift_service_catalog/templates/controller_manager.j2
index c61e05f73..6d3ee7d01 100644
--- a/roles/openshift_service_catalog/templates/controller_manager.j2
+++ b/roles/openshift_service_catalog/templates/controller_manager.j2
@@ -44,7 +44,7 @@ spec:
{% endif %}
image: {{ openshift_service_catalog_image_prefix }}service-catalog:{{ openshift_service_catalog_image_version }}
command: ["/usr/bin/service-catalog"]
- imagePullPolicy: Always
+ imagePullPolicy: IfNotPresent
name: controller-manager
ports:
- containerPort: 8080