From ef43b2159739678e3d0cc2c3df5ceeae6914e2a1 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Tue, 13 Sep 2016 16:48:07 +0300
Subject: [PATCH] Fix kubedns idempotency
Removed api-version from kube.py because it is deprecated.
Updating both kube.py because dnsmasq one is actually used.
Fixed name back to kubedns for checking its resource.
---
roles/dnsmasq/library/kube.py | 13 -------------
roles/kubernetes-apps/ansible/library/kube.py | 13 -------------
roles/kubernetes-apps/ansible/tasks/main.yaml | 2 +-
3 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/roles/dnsmasq/library/kube.py b/roles/dnsmasq/library/kube.py
index aab92a733..2922c6212 100644
--- a/roles/dnsmasq/library/kube.py
+++ b/roles/dnsmasq/library/kube.py
@@ -44,12 +44,6 @@ options:
default: null
description:
- The url for the API server that commands are executed against.
- api_version:
- required: false
- choices: ['v1', 'v1beta3']
- default: v1
- description:
- - The API version associated with cluster.
force:
required: false
default: false
@@ -105,10 +99,6 @@ class KubeManager(object):
if self.kubectl is None:
self.kubectl = module.get_bin_path('kubectl', True)
self.base_cmd = [self.kubectl]
- self.api_version = module.params.get('api_version')
-
- if self.api_version:
- self.base_cmd.append('--api-version=' + self.api_version)
if module.params.get('server'):
self.base_cmd.append('--server=' + module.params.get('server'))
@@ -164,8 +154,6 @@ class KubeManager(object):
return []
cmd = ['replace']
- if self.api_version != 'v1':
- cmd = ['update']
if self.force:
cmd.append('--force')
@@ -271,7 +259,6 @@ def main():
label=dict(),
server=dict(),
kubectl=dict(),
- api_version=dict(default='v1', choices=['v1', 'v1beta3']),
force=dict(default=False, type='bool'),
all=dict(default=False, type='bool'),
log_level=dict(default=0, type='int'),
diff --git a/roles/kubernetes-apps/ansible/library/kube.py b/roles/kubernetes-apps/ansible/library/kube.py
index aab92a733..2922c6212 100644
--- a/roles/kubernetes-apps/ansible/library/kube.py
+++ b/roles/kubernetes-apps/ansible/library/kube.py
@@ -44,12 +44,6 @@ options:
default: null
description:
- The url for the API server that commands are executed against.
- api_version:
- required: false
- choices: ['v1', 'v1beta3']
- default: v1
- description:
- - The API version associated with cluster.
force:
required: false
default: false
@@ -105,10 +99,6 @@ class KubeManager(object):
if self.kubectl is None:
self.kubectl = module.get_bin_path('kubectl', True)
self.base_cmd = [self.kubectl]
- self.api_version = module.params.get('api_version')
-
- if self.api_version:
- self.base_cmd.append('--api-version=' + self.api_version)
if module.params.get('server'):
self.base_cmd.append('--server=' + module.params.get('server'))
@@ -164,8 +154,6 @@ class KubeManager(object):
return []
cmd = ['replace']
- if self.api_version != 'v1':
- cmd = ['update']
if self.force:
cmd.append('--force')
@@ -271,7 +259,6 @@ def main():
label=dict(),
server=dict(),
kubectl=dict(),
- api_version=dict(default='v1', choices=['v1', 'v1beta3']),
force=dict(default=False, type='bool'),
all=dict(default=False, type='bool'),
log_level=dict(default=0, type='int'),
diff --git a/roles/kubernetes-apps/ansible/tasks/main.yaml b/roles/kubernetes-apps/ansible/tasks/main.yaml
index d5694c669..aadd9c1a5 100644
--- a/roles/kubernetes-apps/ansible/tasks/main.yaml
+++ b/roles/kubernetes-apps/ansible/tasks/main.yaml
@@ -9,7 +9,7 @@
- name: Kubernetes Apps | Start Resources
kube:
- name: KubeDNS
+ name: kubedns
namespace: kube-system
kubectl: "{{bin_dir}}/kubectl"
resource: "{{item.item.type}}"
--
GitLab