updating scripts./aws plugin version

EarthmanT · Aug 13, 2017 · 8b5d1ec · 8b5d1ec
1 parent 1c1021c
commit 8b5d1ec
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 34 deletions.
diff --git a/aws-blueprint.yaml b/aws-blueprint.yaml
@@ -5,7 +5,7 @@ description: >
 
 imports:
   - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-manager/4.1/resources/rest-service/cloudify/types/types.yaml
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-aws-plugin/1.4.13/plugin.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-aws-plugin/1.5/plugin.yaml
   - https://raw.githubusercontent.com/cloudify-incubator/cloudify-utilities-plugin/1.2.5/plugin.yaml
   - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-diamond-plugin/1.3.5/plugin.yaml
   - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-fabric-plugin/1.5/plugin.yaml

diff --git a/scripts/kubernetes_master/configure.py b/scripts/kubernetes_master/configure.py
@@ -8,6 +8,7 @@
 import subprocess
 from cloudify import ctx
 from cloudify.exceptions import OperationRetry
+from cloudify_rest_client.exceptions import CloudifyClientError
 
 JOIN_COMMAND_REGEX = '^kubeadm join[\sA-Za-z0-9\.\:\-\_]*'
 BOOTSTRAP_TOKEN_REGEX = '[a-z0-9]{6}.[a-z0-9]{16}'
@@ -74,21 +75,27 @@ def setup_secrets(_split_master_port, _bootstrap_token):
     ctx.instance.runtime_properties['bootstrap_token'] = _bootstrap_token
     from cloudify import manager
     cfy_client = manager.get_rest_client()
-    try:
-        _secret_key = 'kubernetes_master_ip'
-        if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
-            cfy_client.secrets.create(key=_secret_key, value=master_ip)
-            ctx.logger.info('Set secret: {0}.'.format(_secret_key))
-        _secret_key = 'kubernetes_master_port'
-        if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
-            cfy_client.secrets.create(key=_secret_key, value=master_port)
-            ctx.logger.info('Set secret: {0}.'.format(_secret_key))
-        _secret_key = 'bootstrap_token'
-        if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
-            cfy_client.secrets.create(key=_secret_key, value=_bootstrap_token)
-            ctx.logger.info('Set secret: {0}.'.format(_secret_key))
-    except Exception:
-        pass
+
+    _secret_key = 'kubernetes_master_ip'
+    if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
+        cfy_client.secrets.create(key=_secret_key, value=master_ip)
+    else:
+        cfy_client.secrets.update(key=_secret_key, value=master_ip)
+    ctx.logger.info('Set secret: {0}.'.format(_secret_key))
+
+    _secret_key = 'kubernetes_master_port'
+    if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
+        cfy_client.secrets.create(key=_secret_key, value=master_port)
+    else:
+        cfy_client.secrets.update(key=_secret_key, value=master_port)
+    ctx.logger.info('Set secret: {0}.'.format(_secret_key))
+
+    _secret_key = 'bootstrap_token'
+    if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
+        cfy_client.secrets.create(key=_secret_key, value=_bootstrap_token)
+    else:
+        cfy_client.secrets.update(key=_secret_key, value=_bootstrap_token)
+    ctx.logger.info('Set secret: {0}.'.format(_secret_key))
 
 
 if __name__ == '__main__':

diff --git a/scripts/kubernetes_master/start.py b/scripts/kubernetes_master/start.py
@@ -87,13 +87,13 @@ def check_kubedns_status(_get_pods):
     for cluster in clusters:
         __name = cluster.get('name')
         _cluster = cluster.get('cluster', {})
-        try:
-            _secret_key = '%s_certificate_authority_data' % __name
-            if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
-                cfy_client.secrets.create(key=_secret_key, value=_cluster.get('certificate-authority-data'))
-                ctx.logger.info('Set secret: {0}.'.format(_secret_key))
-        except Exception:
-            pass
+        _secret_key = '%s_certificate_authority_data' % __name
+        if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
+            cfy_client.secrets.create(key=_secret_key, value=_cluster.get('certificate-authority-data'))
+            ctx.logger.info('Set secret: {0}.'.format(_secret_key))
+        else:
+            cfy_client.secrets.update(key=_secret_key, value=_cluster.get('certificate-authority-data'))
+        ctx.instance.runtime_properties['%s_certificate_authority_data' % __name] = _cluster.get('certificate-authority-data')
         _clusters[__name] = _cluster
     del __name
 
@@ -110,17 +110,20 @@ def check_kubedns_status(_get_pods):
     for user in users:
         __name = user.get('name')
         _user = user.get('user', {})
-        try:
-            _secret_key = '%s_client_certificate_data' % __name
-            if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
-                cfy_client.secrets.create(key=_secret_key, value=_user.get('client-certificate-data'))
-                ctx.logger.info('Set secret: {0}.'.format(_secret_key))
-            _secret_key = '%s_client_key_data' % __name
-            if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
-                cfy_client.secrets.create(key=_secret_key, value=_user.get('client-key-data'))
-                ctx.logger.info('Set secret: {0}.'.format(_secret_key))
-        except Exception:
-            pass
+        _secret_key = '%s_client_certificate_data' % __name
+        if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
+            cfy_client.secrets.create(key=_secret_key, value=_user.get('client-certificate-data'))
+            ctx.logger.info('Set secret: {0}.'.format(_secret_key))
+        else:
+            cfy_client.secrets.update(key=_secret_key, value=_user.get('client-certificate-data'))
+        _secret_key = '%s_client_key_data' % __name
+        if cfy_client and not len(cfy_client.secrets.list(key=_secret_key)) == 1:
+            cfy_client.secrets.create(key=_secret_key, value=_user.get('client-key-data'))
+            ctx.logger.info('Set secret: {0}.'.format(_secret_key))
+        else:
+            cfy_client.secrets.update(key=_secret_key, value=_user.get('client-key-data'))
+        ctx.instance.runtime_properties['%s_client_certificate_data' % __name] = _user.get('client-certificate-data')
+        ctx.instance.runtime_properties['%s_client_key_data' % __name] = _user.get('client-key-data')
         _users[__name] = _user
     del __name