Merge branch 'improvement/1034-calico37' into q/2.0

Author: bert-e

buildchain/buildchain/image.py

@@ -104,8 +104,17 @@ def task__image_build() -> Iterator[types.TaskDict]:
         registry='calico',
         name='calico-node',
         remote_name='node',
-        version='3.5.1',
-        digest='sha256:5baaa4795256e4f14c03fdccc534d46c2d7ff3ac84e748bacf88b1fa8c25d952',
+        version='3.7.2',
+        digest='sha256:8b565422f4cabd9652e0e912f3ea8707734cbc69f5835642f094d1ed0a087d5b',
+        destination=ISO_IMAGE_ROOT,
+        task_dep=['_image_mkdir_root'],
+    ),
+    targets.RemoteImage(
+        registry='calico',
+        name='calico-kube-controllers',
+        remote_name='kube-controllers',
+        version='3.7.2',
+        digest='sha256:d5533cb8df6150123cad26e369383a3e665c5e376f8c9dd7d80a8c86fa907e7c',
         destination=ISO_IMAGE_ROOT,
         task_dep=['_image_mkdir_root'],
     ),

buildchain/buildchain/packaging.py

@@ -142,7 +142,7 @@ def task__build_repositories() -> Iterator[types.TaskDict]:
 )
 
 
-CALICO_CNI_PLUGIN_VERSION : str = '3.5.1'
+CALICO_CNI_PLUGIN_VERSION : str = '3.7.2'
 # Packages per repository.
 PACKAGES : Dict[str, Tuple[targets.Package, ...]] = {
     'scality': (

buildchain/buildchain/salt_tree.py

@@ -133,6 +133,7 @@ def task__deploy_salt_tree() -> Iterator[types.TaskDict]:
     Path('salt/metalk8s/kubernetes/cni/calico/deployed.sls'),
     Path('salt/metalk8s/kubernetes/cni/calico/init.sls'),
     Path('salt/metalk8s/kubernetes/cni/calico/installed.sls'),
+    Path('salt/metalk8s/kubernetes/cni/calico/upgraded.sls'),
     Path('salt/metalk8s/kubernetes/cni/loopback/configured.sls'),
     Path('salt/metalk8s/kubernetes/cni/loopback/init.sls'),
     Path('salt/metalk8s/kubernetes/cni/loopback/installed.sls'),

buildchain/buildchain/targets/directory.py

@@ -40,4 +40,4 @@ def task(self) -> types.TaskDict:
 
     @staticmethod
     def _run(directory: Path) -> None:
-        directory.mkdir()
+        directory.mkdir(exist_ok=True)

packages/calico-cni-plugin.spec

@@ -6,12 +6,12 @@
 
 %ifarch x86_64
 %global built_arch              amd64
-%global calico_sha256           7032dc23d13ec1fa1c9f12c1cd7069e78b5fc563d9ae91457c6602496664e57d
-%global calico_ipam_sha256      cf6a6a106ae39c7ba309b22045f62c17ec94882a5ed1a07ab5a8dfb05b157979
+%global calico_sha256           b6d62e37d0609ae3c46d2318f8faf4c83900b6da1e459df6305e4ab54860b6a1
+%global calico_ipam_sha256      20a84a81836946530b5927d6d61dc3d14d335bcff3e7dfa6f140ac40f41e6c4a
 %endif
 
 Name:           calico-cni-plugin
-Version:        3.5.1
+Version:        3.7.2
 Release:        1%{?dist}
 Summary:        Calico CNI plugin
 
@@ -49,6 +49,9 @@ install -p -m 755 %{SOURCE2} %{buildroot}/opt/cni/bin/calico-ipam
 %doc README.md
 
 %changelog
+* Fri May 10 2019 Nicolas Trangez <nicolas.trangez@scality.com> - 3.7.2-1
+- Version bump
+
 * Thu Feb 14 2019 Nicolas Trangez <nicolas.trangez@scality.com> - 3.5.1-1
 - Version bump
 

salt/_renderers/metalk8s_kubernetes.py

@@ -61,19 +61,100 @@ def register(f):
 
 
 @handle('v1', 'ServiceAccount')
-def _handle_v1_serviceaccount(obj):
+def _handle_v1_serviceaccount(obj, kubeconfig, context):
     return {
         'metalk8s_kubernetes.serviceaccount_present': [
             {'name': obj['metadata']['name']},
+            {'kubeconfig': kubeconfig},
+            {'context': context},
             {'namespace': obj['metadata']['namespace']},
         ],
     }
 
 
+@handle('v1', 'ConfigMap')
+def _handle_v1_configmap(obj, kubeconfig, context):
+    return {
+        'metalk8s_kubernetes.configmap_present': [
+            {'name': obj['metadata']['name']},
+            {'kubeconfig': kubeconfig},
+            {'context': context},
+            {'namespace': obj['metadata']['namespace']},
+            {'data': obj['data']},
+        ],
+    }
+
+
+@handle('apiextensions.k8s.io/v1beta1', 'CustomResourceDefinition')
+def _handle_apiextensions_v1beta1_customresourcedefinition(
+        obj, kubeconfig, context):
+    return {
+        'metalk8s_kubernetes.customresourcedefinition_present': [
+            {'name': obj['metadata']['name']},
+            {'kubeconfig': kubeconfig},
+            {'context': context},
+            {'spec': obj['spec']},
+        ],
+    }
+
+
+@handle('rbac.authorization.k8s.io/v1beta1', 'ClusterRole')
+def _handle_rbac_v1beta1_clusterrole(obj, kubeconfig, context):
+    return {
+        'metalk8s_kubernetes.clusterrole_present': [
+            {'name': obj['metadata']['name']},
+            {'kubeconfig': kubeconfig},
+            {'context': context},
+            {'rules': obj['rules']},
+        ],
+    }
+
+
+@handle('rbac.authorization.k8s.io/v1beta1', 'ClusterRoleBinding')
+def _handle_rbac_v1beta1_clusterrolebinding(obj, kubeconfig, context):
+    return {
+        'metalk8s_kubernetes.clusterrolebinding_present': [
+            {'name': obj['metadata']['name']},
+            {'kubeconfig': kubeconfig},
+            {'context': context},
+            {'role_ref': obj['roleRef']},
+            {'subjects': obj['subjects']},
+        ],
+    }
+
+
+@handle('extensions/v1beta1', 'DaemonSet')
+def _handle_extensions_v1beta1_daemonset(obj, kubeconfig, context):
+    return {
+        'metalk8s_kubernetes.daemonset_present': [
+            {'name': obj['metadata']['name']},
+            {'kubeconfig': kubeconfig},
+            {'context': context},
+            {'namespace': obj['metadata']['namespace']},
+            {'metadata': obj['metadata']},
+            {'spec': obj['spec']},
+        ],
+    }
+
+
+@handle('extensions/v1beta1', 'Deployment')
+def _handle_extensions_v1beta1_deployment(obj, kubeconfig, context):
+    return {
+        'metalk8s_kubernetes.deployment_present': [
+            {'name': obj['metadata']['name']},
+            {'kubeconfig': kubeconfig},
+            {'context': context},
+            {'namespace': obj['metadata']['namespace']},
+            {'metadata': obj['metadata']},
+            {'spec': obj['spec']},
+        ],
+    }
+
+
 del handle
 
 
-def _step(obj):
+def _step(obj, kubeconfig=None, context=None):
     '''
     Handle a single Kubernetes object, rendering it into a state 'step'
     '''
@@ -85,15 +166,24 @@ def _step(obj):
     if not handler:
         raise ValueError('No handler for {}/{}'.format(api_version, kind))
 
-    state = handler(obj)
+    state = handler(obj, kubeconfig=kubeconfig, context=context)
 
     return (name, state)
 
 
 def render(yaml_data, saltenv='', sls='', **kwargs):
+    args = six.moves.urllib.parse.parse_qs(kwargs.get('argline', ''))
+
+    kubeconfig = args.get('kubeconfig', [None])[0]
+    context = args.get('context', [None])[0]
+
     if not isinstance(yaml_data, six.string_types):
         yaml_data = yaml_data.read()
 
     data = yaml.load_all(yaml_data, Loader=salt.utils.yaml.SaltYamlSafeLoader)
 
-    return OrderedDict(_step(obj) for obj in data if obj)
+    return OrderedDict(
+        _step(obj, kubeconfig=kubeconfig, context=context)
+        for obj in data
+        if obj
+    )

salt/metalk8s/kubernetes/cni/calico/configured.sls

@@ -33,11 +33,10 @@ Create CNI calico configuration file:
           - type: "calico"
             log_level: "info"
             datastore_type: "kubernetes"
-            nodename: {{ salt['network.get_hostname']() }}
+            nodename: {{ grains.id }}
             mtu: 1440
             ipam:
-              type: "host-local"
-              subnet: "usePodCidr"
+              type: "calico-ipam"
             policy:
               type: "k8s"
             kubernetes: