diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-13 21:46:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 21:46:15 -0400 |
| commit | 85a3806b57858b35b793b8391b67f88bfeec9e10 (patch) | |
| tree | 01322684429cf6d9807582b0fb0d13dafb3107b4 /roles/calico_master/templates | |
| parent | 4dcd01577bc6f92ef6f1f294c4374a14e0895b96 (diff) | |
| parent | 1720a5209dab342b84afd625cf609fe8fddf1f83 (diff) | |
| download | openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.gz openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.bz2 openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.xz openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.zip | |
Merge branch 'master' into Upgrade_Calico_Version_to_2.2.1
Diffstat (limited to 'roles/calico_master/templates')
| -rw-r--r-- | roles/calico_master/templates/calico-policy-controller.yml.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/calico_master/templates/calico-policy-controller.yml.j2 b/roles/calico_master/templates/calico-policy-controller.yml.j2 index 31714dd81..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.6.0 + image: {{ calico_url_policy_controller }} env: # The location of the Calico etcd cluster. - name: ETCD_ENDPOINTS |