| commit | 3745c6b3694af639c7095294de6434b504109bfe | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Wed Mar 07 13:47:37 2018 +0000 |
| committer | Gerrit Code Review <gerrit2@56fc70e46927> | Wed Mar 07 13:47:37 2018 +0000 |
| tree | a379f08bd21de4c92cec7fcdb51e80fba7c8fe12 | |
| parent | 01f40885d2408d435a51d28a0327c8ac49e3511e [diff] | |
| parent | 60f5f66df415dd0d1135d54b0b49dac95b54fac7 [diff] |
Merge "Update extra repo to oscore jobs"
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml index 5db89c6..78e91a0 100644 --- a/kubernetes/master/cluster.yml +++ b/kubernetes/master/cluster.yml
@@ -11,7 +11,6 @@ master: container: false network: - engine: calico calico: prometheus: enabled: true
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml index cc8d8ab..684af64 100644 --- a/kubernetes/master/single.yml +++ b/kubernetes/master/single.yml
@@ -7,5 +7,3 @@ kubernetes: master: container: false - network: - engine: calico
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml index 2491dce..d223d57 100644 --- a/kubernetes/pool/cluster.yml +++ b/kubernetes/pool/cluster.yml
@@ -15,7 +15,6 @@ pool: container: false network: - engine: calico calico: prometheus: enabled: true
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml index 883114b..d6282c3 100644 --- a/kubernetes/pool/single.yml +++ b/kubernetes/pool/single.yml
@@ -14,8 +14,6 @@ kubernetes: pool: container: false - network: - engine: calico docker: host: options: