forwarded 889932
https://github.com/salt-formulas/salt-formula-kubernetes/pull/12
thanks
Hi,
the build failure is caused by missing Python 3 support. I created a
upstream pull request and backported that commit for the Debian package.
An attached patch that I applied for the Ubuntu package is attached.
On Thu, 08 Feb 2018 23:08:57 +0200 Adrian Bunk <b...@debian.org> wrote:
> Source: salt-formula-kubernetes
> Version: 2016.12.1-1
> Severity: serious
> Tags: buster sid
>
> https://ci.debian.net/packages/s/salt-formula-kubernetes/unstable/amd6
4/
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/sal
t-formula-kubernetes.html
>
> ...
> dh_auto_test
> make -j15 test
> make[1]: Entering directory '/build/1st/salt-formula-kubernetes-
2016.12.1'
> [ ! -d tests ] || (cd tests; ./run_tests.sh)
> /usr/bin/salt-call
> [ERROR ] Rendering exception occurred: Jinja variable
'salt.utils.odict.OrderedDict object' has no attribute 'iteritems'
> [CRITICAL] Rendering SLS 'base:kubernetes.master.controller' failed:
Jinja variable 'salt.utils.odict.OrderedDict object' has no attribute
'iteritems'
> [ERROR ] Rendering exception occurred: Jinja variable
'salt.utils.odict.OrderedDict object' has no attribute 'iteritems'
> [CRITICAL] Rendering SLS 'base:kubernetes.master.setup' failed: Jinja
variable 'salt.utils.odict.OrderedDict object' has no attribute
'iteritems'
> local:
> - Rendering SLS 'base:kubernetes.master.controller' failed: Jinja
variable 'salt.utils.odict.OrderedDict object' has no attribute
'iteritems'
> - Rendering SLS 'base:kubernetes.master.setup' failed: Jinja
variable 'salt.utils.odict.OrderedDict object' has no attribute
'iteritems'
> [ERROR] Execution of kubernetes.master_cluster failed
> [ERROR] Execution failed
> Makefile:22: recipe for target 'test' failed
> make[1]: *** [test] Error 1
>
>
--
Benjamin Drung
Debian & Ubuntu Developer
diff -Nru salt-formula-kubernetes-2016.12.1/debian/changelog salt-formula-kubernetes-2016.12.1/debian/changelog
--- salt-formula-kubernetes-2016.12.1/debian/changelog 2016-12-25 17:05:59.000000000 +0100
+++ salt-formula-kubernetes-2016.12.1/debian/changelog 2018-02-15 00:34:06.000000000 +0100
@@ -1,3 +1,9 @@
+salt-formula-kubernetes (2016.12.1-1ubuntu1) bionic; urgency=medium
+
+ * Support Python 3 (Closes: #889932)
+
+ -- Benjamin Drung <bdr...@ubuntu.com> Thu, 15 Feb 2018 00:34:06 +0100
+
salt-formula-kubernetes (2016.12.1-1) unstable; urgency=medium
* New upstream release
diff -Nru salt-formula-kubernetes-2016.12.1/debian/control salt-formula-kubernetes-2016.12.1/debian/control
--- salt-formula-kubernetes-2016.12.1/debian/control 2016-11-21 16:06:19.000000000 +0100
+++ salt-formula-kubernetes-2016.12.1/debian/control 2018-02-15 00:34:06.000000000 +0100
@@ -1,5 +1,6 @@
Source: salt-formula-kubernetes
-Maintainer: PKG OpenStack <openstack-de...@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: PKG OpenStack <openstack-de...@lists.alioth.debian.org>
Uploaders: Filip Pytloun <fi...@pytloun.cz>,
Ondřej Nový <on...@debian.org>,
Section: admin
diff -Nru salt-formula-kubernetes-2016.12.1/debian/patches/0001-Support-Python-3.patch salt-formula-kubernetes-2016.12.1/debian/patches/0001-Support-Python-3.patch
--- salt-formula-kubernetes-2016.12.1/debian/patches/0001-Support-Python-3.patch 1970-01-01 01:00:00.000000000 +0100
+++ salt-formula-kubernetes-2016.12.1/debian/patches/0001-Support-Python-3.patch 2018-02-15 00:34:06.000000000 +0100
@@ -0,0 +1,204 @@
+From 8af2fa9672fd2a3f0045465b24738206e8f8d552 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <bdr...@debian.org>
+Date: Thu, 15 Feb 2018 00:08:00 +0100
+Subject: [PATCH] Support Python 3
+
+Bug-Debian: https://bugs.debian.org/889932
+Forwarded: https://github.com/salt-formulas/salt-formula-kubernetes/pull/12
+---
+ kubernetes/control/configmap.sls | 4 ++--
+ kubernetes/control/job.sls | 2 +-
+ kubernetes/control/role.sls | 4 ++--
+ kubernetes/control/service.sls | 4 ++--
+ kubernetes/files/basic_auth.csv | 2 +-
+ kubernetes/files/collectd_calico_bird.conf | 2 +-
+ kubernetes/files/configmap.yml | 2 +-
+ kubernetes/files/dockershim/default.master | 2 +-
+ kubernetes/files/dockershim/default.pool | 2 +-
+ kubernetes/files/job.yml | 6 +++---
+ kubernetes/files/known_tokens.csv | 2 +-
+ kubernetes/files/kube-addons/dns/kubedns-rc.yaml | 2 +-
+ kubernetes/files/kubelet/default.master | 2 +-
+ kubernetes/files/kubelet/default.pool | 2 +-
+ kubernetes/files/manifest/kube-apiserver.manifest | 2 +-
+ kubernetes/files/manifest/kube-controller-manager.manifest | 2 +-
+ kubernetes/files/manifest/kube-proxy.manifest.pool | 2 +-
+ kubernetes/files/manifest/kube-scheduler.manifest | 2 +-
+ kubernetes/files/rc.yml | 10 +++++-----
+ kubernetes/files/rolebinding.yml | 2 +-
+ kubernetes/master/controller.sls | 10 +++++-----
+ kubernetes/master/kube-addons.sls | 2 +-
+ kubernetes/master/setup.sls | 2 +-
+ kubernetes/pool/kube-proxy.sls | 2 +-
+ 24 files changed, 37 insertions(+), 37 deletions(-)
+
+--- a/kubernetes/files/configmap.yml
++++ b/kubernetes/files/configmap.yml
+@@ -10,7 +10,7 @@
+ {%- if pillar.get(service_name, {}).get('_support', {}).get('config', {}).get('enabled', False) %}
+ {%- set support_fragment_file = service_name+'/meta/config.yml' %}
+ {%- set service_config_files = load_support_file(support_fragment_file, configmap.pillar, configmap.get('grains', {}))|load_yaml %}
+- {%- for service_config_name, service_config in service_config_files.config.iteritems() %}
++ {%- for service_config_name, service_config in service_config_files.config.items() %}
+ {{ service_config_name }}: |
+ {{ load_support_file(service_config.source|replace('salt://', ''), configmap.pillar, configmap.get('grains', {}))|indent(4) }}
+ {%- endfor %}
+--- a/kubernetes/files/job.yml
++++ b/kubernetes/files/job.yml
+@@ -15,7 +15,7 @@
+ hostPID: True
+ {%- endif %}
+ containers:
+- {%- for container_name, container in job.container.iteritems() %}
++ {%- for container_name, container in job.container.items() %}
+ - name: {{ container_name }}
+ image: {% if container.registry is defined %}{{ container.registry }}/{%- endif %}{{ container.image }}{%- if container.tag is defined %}:{{ container.tag }}{%- endif %}
+ imagePullPolicy: {{ container.get('image_pull_policy', 'IfNotPresent') }}
+@@ -53,7 +53,7 @@
+ {%- endfor %}
+ {%- if job.volume is defined %}
+ volumes:
+- {%- for volume_name, volume in job.volume.iteritems() %}
++ {%- for volume_name, volume in job.volume.items() %}
+ - name: {{ volume_name }}
+ {%- if volume.type == 'empty_dir' %}
+ emptyDir: {}
+@@ -69,7 +69,7 @@
+ configMap:
+ name: {{ volume_name }}
+ items:
+- {%- for name, item in volume.item.iteritems() %}
++ {%- for name, item in volume.item.items() %}
+ - key: {{ item.key }}
+ path: {{ item.path }}
+ {%- endfor %}
+--- a/kubernetes/files/rc.yml
++++ b/kubernetes/files/rc.yml
+@@ -47,9 +47,9 @@
+ {%- if service.affinity is defined %}
+ scheduler.alpha.kubernetes.io/affinity: >
+ {
+- {%- for affinity_name, affinity in service.affinity.iteritems() %}
++ {%- for affinity_name, affinity in service.affinity.items() %}
+ "{{ affinity.name }}": {
+- {%- for expression_name, expression in affinity.expression.iteritems() %}
++ {%- for expression_name, expression in affinity.expression.items() %}
+ {%- if expression.name == 'matchExpressions' %}
+ "{{ affinity.get('type','required') }}DuringSchedulingIgnoredDuringExecution": {
+ "nodeSelectorTerms": [
+@@ -96,7 +96,7 @@
+ hostPID: True
+ {%- endif %}
+ containers:
+- {%- for container_name, container in service.container.iteritems() %}
++ {%- for container_name, container in service.container.items() %}
+ - name: {{ container_name }}
+ image: {% if container.registry is defined %}{{ container.registry }}/{%- endif %}{{ container.image }}{%- if container.tag is defined %}:{{ container.tag }}{%- endif %}
+ imagePullPolicy: {{ container.get('image_pull_policy','IfNotPresent') }}
+@@ -176,7 +176,7 @@
+ {%- endfor %}
+ {%- if service.volume is defined %}
+ volumes:
+- {%- for volume_name, volume in service.volume.iteritems() %}
++ {%- for volume_name, volume in service.volume.items() %}
+ - name: {{ volume_name }}
+ {%- if volume.type == 'emptyDir' %}
+ emptyDir: {}
+@@ -192,7 +192,7 @@
+ configMap:
+ name: {{ volume_name }}-{{ volume.get('version', '1') }}
+ items:
+- {%- for name, item in volume.item.iteritems() %}
++ {%- for name, item in volume.item.items() %}
+ - key: {{ item.key }}
+ path: {{ item.path }}
+ {%- endfor %}
+--- a/kubernetes/master/controller.sls
++++ b/kubernetes/master/controller.sls
+@@ -166,7 +166,7 @@
+
+ {%- endif %}
+
+-{%- for name,namespace in master.namespace.iteritems() %}
++{%- for name,namespace in master.namespace.items() %}
+
+ {%- if namespace.enabled %}
+
+@@ -185,7 +185,7 @@
+
+ {%- if master.registry.secret is defined %}
+
+-{%- for name,registry in master.registry.secret.iteritems() %}
++{%- for name,registry in master.registry.secret.items() %}
+
+ {%- if registry.enabled %}
+
+--- a/kubernetes/master/setup.sls
++++ b/kubernetes/master/setup.sls
+@@ -1,7 +1,7 @@
+ {%- from "kubernetes/map.jinja" import master with context %}
+ {%- if master.enabled %}
+
+-{%- for addon_name, addon in master.addons.iteritems() %}
++{%- for addon_name, addon in master.addons.items() %}
+ {%- if addon.enabled %}
+
+ kubernetes_addons_{{ addon_name }}:
+--- salt-formula-kubernetes-2016.12.1.orig/kubernetes/control/cluster.sls
++++ salt-formula-kubernetes-2016.12.1/kubernetes/control/cluster.sls
+@@ -7,7 +7,7 @@
+
+ {%- if control.job is defined %}
+
+-{%- for job_name, job in control.job.iteritems() %}
++{%- for job_name, job in control.job.items() %}
+
+ /srv/kubernetes/jobs/{{ job_name }}-job.yml:
+ file.managed:
+@@ -25,7 +25,7 @@
+
+ {%- endif %}
+
+-{%- for service_name, service in control.service.iteritems() %}
++{%- for service_name, service in control.service.items() %}
+
+ {%- if service.enabled %}
+
+@@ -57,7 +57,7 @@
+
+ {%- endfor %}
+
+-{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
++{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').items() %}
+
+ {%- if node_grains.get('kubernetes', {}).service is defined %}
+
+@@ -94,7 +94,7 @@
+
+ {%- endfor %}
+
+-{%- for configmap_name, configmap in control.get('configmap', {}).iteritems() %}
++{%- for configmap_name, configmap in control.get('configmap', {}).items() %}
+ {%- if configmap.enabled|default(True) %}
+
+ {%- if configmap.pillar is defined %}
+@@ -106,7 +106,7 @@
+ {% macro load_support_file(pillar, grains) %}{% include support_fragment_file %}{% endmacro %}
+
+ {%- set service_config_files = load_support_file(configmap.pillar, configmap.get('grains', {}))|load_yaml %}
+- {%- for service_config_name, service_config in service_config_files.config.iteritems() %}
++ {%- for service_config_name, service_config in service_config_files.config.items() %}
+
+ /srv/kubernetes/configmap/{{ configmap_name }}/{{ service_config_name }}:
+ file.managed:
+--- salt-formula-kubernetes-2016.12.1.orig/kubernetes/pool/kubelet.sls
++++ salt-formula-kubernetes-2016.12.1/kubernetes/pool/kubelet.sls
+@@ -30,7 +30,7 @@ manifest-dir-create:
+
+ {%- if pool.host.label is defined %}
+
+-{%- for name,label in pool.host.label.iteritems() %}
++{%- for name,label in pool.host.label.items() %}
+
+ {%- if label.enabled %}
+
diff -Nru salt-formula-kubernetes-2016.12.1/debian/patches/series salt-formula-kubernetes-2016.12.1/debian/patches/series
--- salt-formula-kubernetes-2016.12.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ salt-formula-kubernetes-2016.12.1/debian/patches/series 2018-02-15 00:34:06.000000000 +0100
@@ -0,0 +1 @@
+0001-Support-Python-3.patch
