diff options
| author | Vincent Schwarzer <vincent.schwarzer@yahoo.de> | 2017-05-26 13:11:08 +0200 |
|---|---|---|
| committer | Vincent Schwarzer <vincent.schwarzer@yahoo.de> | 2017-05-30 10:42:31 +0200 |
| commit | b87687fb5ac41bdd45c5b3b7c2fd7d754ece8a0e (patch) | |
| tree | fa26eafa2df640f2164853ca228e4b86977448a6 /roles/calico_master | |
| parent | 109a54e1b3d916eead0e333f66cbf2d59a87c3a3 (diff) | |
| download | openshift-b87687fb5ac41bdd45c5b3b7c2fd7d754ece8a0e.tar.gz openshift-b87687fb5ac41bdd45c5b3b7c2fd7d754ece8a0e.tar.bz2 openshift-b87687fb5ac41bdd45c5b3b7c2fd7d754ece8a0e.tar.xz openshift-b87687fb5ac41bdd45c5b3b7c2fd7d754ece8a0e.zip | |
Removed hardocded Calico Policy Controller URL
Diffstat (limited to 'roles/calico_master')
| -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 3fb1abf0d..74d19061f 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 |