diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-13 20:05:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 20:05:57 -0400 |
| commit | 974a727ff5640d2479a99e32f7afe91016a06c37 (patch) | |
| tree | 58580d5f5c7bea89c53b1f2e9e60e27e979cfd03 | |
| parent | 3fed1873230d9e84c07824b7de98ae7edfc481ba (diff) | |
| parent | b87687fb5ac41bdd45c5b3b7c2fd7d754ece8a0e (diff) | |
| download | openshift-974a727ff5640d2479a99e32f7afe91016a06c37.tar.gz openshift-974a727ff5640d2479a99e32f7afe91016a06c37.tar.bz2 openshift-974a727ff5640d2479a99e32f7afe91016a06c37.tar.xz openshift-974a727ff5640d2479a99e32f7afe91016a06c37.zip | |
Merge pull request #4295 from VincentS/Remove_Hardcoded_Calico_URL
Merged by openshift-bot
| -rw-r--r-- | roles/calico_master/defaults/main.yaml | 1 | ||||
| -rw-r--r-- | roles/calico_master/templates/calico-policy-controller.yml.j2 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/calico_master/defaults/main.yaml b/roles/calico_master/defaults/main.yaml index 5b324bce5..b2df0105f 100644 --- a/roles/calico_master/defaults/main.yaml +++ b/roles/calico_master/defaults/main.yaml @@ -4,3 +4,4 @@ kubeconfig: "{{ openshift.common.config_base }}/master/openshift-master.kubeconf calicoctl_bin_dir: "/usr/local/bin/" calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.1.3/calicoctl" +calico_url_policy_controller: "quay.io/calico/kube-policy-controller:v0.5.4" diff --git a/roles/calico_master/templates/calico-policy-controller.yml.j2 b/roles/calico_master/templates/calico-policy-controller.yml.j2 index 1b87758ce..811884473 100644 --- a/roles/calico_master/templates/calico-policy-controller.yml.j2 +++ b/roles/calico_master/templates/calico-policy-controller.yml.j2 @@ -74,7 +74,7 @@ spec: serviceAccountName: calico containers: - name: calico-policy-controller - image: quay.io/calico/kube-policy-controller:v0.5.4 + image: {{ calico_url_policy_controller }} env: # The location of the Calico etcd cluster. - name: ETCD_ENDPOINTS |