Hello community, here is the log from the commit of package kubernetes-salt for openSUSE:Factory checked in at 2018-05-29 10:44:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes-salt (Old) and /work/SRC/openSUSE:Factory/.kubernetes-salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes-salt" Tue May 29 10:44:20 2018 rev:22 rq:612254 version:4.0.0+git_r815_4d4d315 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes-salt/kubernetes-salt.changes 2018-05-22 17:02:49.610337287 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes-salt.new/kubernetes-salt.changes 2018-05-29 10:44:22.589695753 +0200 @@ -1,0 +2,61 @@ +Fri May 25 09:41:05 UTC 2018 - [email protected] + +- Commit 2a6eb07 by Rafael Fernández López [email protected] + Remove unsupported `--require-kubeconfig` argument deprecated in Kubernetes + (and removed in 1.10) + + Fixes: bsc#1094217 + + +------------------------------------------------------------------- +Thu May 24 09:46:08 UTC 2018 - [email protected] + +- Commit 200ee84 by Florian Bergmann [email protected] + Use six compatibility library to make modules 2 and 3 compatible. + + +------------------------------------------------------------------- +Wed May 23 18:24:38 UTC 2018 - [email protected] + +- Commit ccde36b by Maximilian Meister [email protected] + fix crio reload and drop a duplicated reload watcher + + fix#reload + + Signed-off-by: Maximilian Meister <[email protected]> + + Commit 9a47960 by Maximilian Meister [email protected] + fix docker reload again + + it apparently doesnt work to use service.running to do the reload. using + cmd.run is reliable + + fix#reload-cert + + Signed-off-by: Maximilian Meister <[email protected]> + + +------------------------------------------------------------------- +Tue May 22 22:07:10 UTC 2018 - [email protected] + +- Commit 7a0c421 by Kiall Mac Innes [email protected] + Run CollaboratorCheck as part of unit test job + + +------------------------------------------------------------------- +Tue May 22 17:24:06 UTC 2018 - [email protected] + +- Commit a4dfabb by Kiall Mac Innes [email protected] + Fix module tests on python3 + + +------------------------------------------------------------------- +Tue May 22 16:54:54 UTC 2018 - [email protected] + +- Commit 8b75460 by Rafael Fernández López [email protected] + Log all CRI issues as we go, and show them if we really timeout + + Related: bsc#1093918 + + +------------------------------------------------------------------- @@ -99,0 +161,2 @@ + + fixes bsc#1090067 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes-salt.spec ++++++ --- /var/tmp/diff_new_pack.wbzmDd/_old 2018-05-29 10:44:23.109676564 +0200 +++ /var/tmp/diff_new_pack.wbzmDd/_new 2018-05-29 10:44:23.113676416 +0200 @@ -32,7 +32,7 @@ Name: kubernetes-salt %define gitrepo salt -Version: 4.0.0+git_r801_c7e2229 +Version: 4.0.0+git_r815_4d4d315 Release: 0 BuildArch: noarch Summary: Production-Grade Container Scheduling and Management ++++++ master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/Jenkinsfile.flake8 new/salt-master/Jenkinsfile.flake8 --- old/salt-master/Jenkinsfile.flake8 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/Jenkinsfile.flake8 2018-05-25 11:42:05.000000000 +0200 @@ -14,8 +14,9 @@ podTemplate(label: label, containers: [ containerTemplate( - name: 'opensuse', - image: 'opensuse:42.3', + name: 'tox', + image: 'registry.suse.de/devel/casp/ci/opensuse_leap_42.3_containers/jenkins-tox-container:latest', + alwaysPullImage: true, ttyEnabled: true, command: 'cat', envVars: [ @@ -29,31 +30,13 @@ checkout scm } - stage('Install Dependencies') { - try { - container('opensuse') { - // TODO: Build a opensuse based python-tox image.. - sh 'zypper in --no-confirm python-tox python-pip python-pyOpenSSL libopenssl1_0_0 openssl' - sh 'tox --notest -e flake8' - } - } catch (Exception e) { - containerLog 'opensuse' - throw e - } - } - stage('Style Checks') { - try { - container('opensuse') { - try { - sh 'tox -e flake8 -- --format=junit-xml --output-file junit.xml' - } finally { - junit "junit.xml" - } + container('tox') { + try { + sh 'tox -e flake8 -- --format=junit-xml --output-file junit.xml' + } finally { + junit "junit.xml" } - } catch (Exception e) { - containerLog 'opensuse' - throw e } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/Jenkinsfile.tests new/salt-master/Jenkinsfile.tests --- old/salt-master/Jenkinsfile.tests 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/Jenkinsfile.tests 2018-05-25 11:42:05.000000000 +0200 @@ -1,9 +1,33 @@ +def targetBranch = env.getEnvironment().get('CHANGE_TARGET', env.BRANCH_NAME) + +library "kubic-jenkins-library@${targetBranch}" + +// TODO: Don't hardcode salt repo name, find the right place +// to lookup this information dynamically. +githubCollaboratorCheck( + org: 'kubic-project', + repo: 'salt', + user: env.CHANGE_AUTHOR, + credentialsId: 'github-token') + def label = "salt-tests-${UUID.randomUUID().toString()}" podTemplate(label: label, containers: [ containerTemplate( - name: 'opensuse', - image: 'opensuse:42.3', + name: 'tox', + image: 'registry.suse.de/devel/casp/ci/opensuse_leap_42.3_containers/jenkins-tox-container:latest', + alwaysPullImage: true, + ttyEnabled: true, + command: 'cat', + envVars: [ + envVar(key: 'http_proxy', value: env.http_proxy), + envVar(key: 'https_proxy', value: env.http_proxy), + ], + ), + containerTemplate( + name: 'tox3', + image: 'registry.suse.de/devel/casp/ci/opensuse_leap_42.3_containers/jenkins-tox3-container:latest', + alwaysPullImage: true, ttyEnabled: true, command: 'cat', envVars: [ @@ -17,64 +41,42 @@ checkout scm } - stage('Install Dependencies') { - try { - container('opensuse') { - // TODO: Build a opensuse based python-tox image.. - sh 'zypper in --no-confirm python-tox python-pip python-pyOpenSSL libopenssl1_0_0 openssl git python3 python-devel python3-devel gcc libzmq5 zeromq-devel python-xml' - } - } catch (Exception e) { - containerLog 'opensuse' - throw e - } - } - stage('Create Test Virtualenv') { - try { - parallel( - 'Python 2.7': { - container('opensuse') { - sh 'tox --notest -e tests-salt-2016.11.4-py27' - } - }, - 'Python 3.4': { - container('opensuse') { - sh 'tox --notest -e tests-salt-2016.11.4-py34' - } + parallel( + 'Python 2.7': { + container('tox') { + sh 'tox --notest -e tests-salt-2016.11.4-py27' + } + }, + 'Python 3.4': { + container('tox3') { + sh 'tox --notest -e tests-salt-2016.11.4-py34' } - ) - } catch (Exception e) { - containerLog 'opensuse' - throw e - } + } + ) } stage('Run Tests') { - try { - parallel( - 'Python 2.7': { - container('opensuse') { - try { - sh 'tox -e tests-salt-2016.11.4-py27 -- --with-xunit --xunit-testsuite-name=salt-2016.11.4-py27 --xunit-file=tests-salt-2016.11.4-py27.xml' - } finally { - junit "tests-salt-2016.11.4-py27.xml" - } + parallel( + 'Python 2.7': { + container('tox') { + try { + sh 'tox -e tests-salt-2016.11.4-py27 -- --with-xunit --xunit-testsuite-name=salt-2016.11.4-py27 --xunit-file=tests-salt-2016.11.4-py27.xml' + } finally { + junit "tests-salt-2016.11.4-py27.xml" } - }, - 'Python 3.4': { - container('opensuse') { - try { - sh 'tox -e tests-salt-2016.11.4-py34 -- --with-xunit --xunit-testsuite-name=salt-2016.11.4-py34 --xunit-file=tests-salt-2016.11.4-py34.xml' - } finally { - junit "tests-salt-2016.11.4-py34.xml" - } + } + }, + 'Python 3.4': { + container('tox3') { + try { + sh 'tox -e tests-salt-2016.11.4-py34 -- --with-xunit --xunit-testsuite-name=salt-2016.11.4-py34 --xunit-file=tests-salt-2016.11.4-py34.xml' + } finally { + junit "tests-salt-2016.11.4-py34.xml" } } - ) - } catch (Exception e) { - containerLog 'opensuse' - throw e - } + } + ) } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/caasp_cri.py new/salt-master/salt/_modules/caasp_cri.py --- old/salt-master/salt/_modules/caasp_cri.py 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/_modules/caasp_cri.py 2018-05-25 11:42:05.000000000 +0200 @@ -202,6 +202,7 @@ ''' timeout = int(__salt__['pillar.get']('cri:socket_timeout', '20')) expire = time.time() + timeout + errors = {'attempts': []} while time.time() < expire: cmd = "crictl --runtime-endpoint {socket} info".format( @@ -214,11 +215,13 @@ if result['retcode'] == 0: return + errors['attempts'].append(result) + time.sleep(0.3) raise CommandExecutionError( 'CRI socket did not become ready', - info={'errors': ['CRI socket did not become ready']} + info=errors ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/caasp_docker.py new/salt-master/salt/_modules/caasp_docker.py --- old/salt-master/salt/_modules/caasp_docker.py 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/_modules/caasp_docker.py 2018-05-25 11:42:05.000000000 +0200 @@ -1,6 +1,6 @@ from __future__ import absolute_import -from urlparse import urlparse +from salt.ext.six.moves.urllib.parse import urlparse from caasp_log import debug, error diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/caasp_pillar.py new/salt-master/salt/_modules/caasp_pillar.py --- old/salt-master/salt/_modules/caasp_pillar.py 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/_modules/caasp_pillar.py 2018-05-25 11:42:05.000000000 +0200 @@ -1,4 +1,5 @@ from __future__ import absolute_import +from salt.ext import six def __virtual__(): @@ -21,7 +22,7 @@ if res is None: res = default - if isinstance(res, basestring): + if isinstance(res, six.string_types): try: return int(res) except ValueError: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_states/caasp_cmd.py new/salt-master/salt/_states/caasp_cmd.py --- old/salt-master/salt/_states/caasp_cmd.py 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/_states/caasp_cmd.py 2018-05-25 11:42:05.000000000 +0200 @@ -1,6 +1,7 @@ from __future__ import absolute_import import time +from salt.ext.six.moves import range def run(name, @@ -168,7 +169,7 @@ ret = None - for attempt in xrange(retry_['attempts']): + for attempt in range(retry_['attempts']): ret = __states__['cmd.run'](name=name, onlyif=onlyif, unless=unless, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_states/caasp_retriable.py new/salt-master/salt/_states/caasp_retriable.py --- old/salt-master/salt/_states/caasp_retriable.py 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/_states/caasp_retriable.py 2018-05-25 11:42:05.000000000 +0200 @@ -1,5 +1,6 @@ from __future__ import absolute_import import time +from salt.ext.six.moves import range def retry(name, target, retry={}, **kwargs): @@ -26,7 +27,7 @@ ret = None - for attempt in xrange(retry_['attempts']): + for attempt in range(retry_['attempts']): try: ret = __states__[target](name=name, **kwargs) except BaseException as e: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_states/caasp_service.py new/salt-master/salt/_states/caasp_service.py --- old/salt-master/salt/_states/caasp_service.py 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/_states/caasp_service.py 2018-05-25 11:42:05.000000000 +0200 @@ -1,5 +1,6 @@ from __future__ import absolute_import import time +from salt.ext.six.moves import range def running_stable(name, enable=None, sig=None, init_delay=None, successful_retries_in_a_row=50, @@ -55,7 +56,7 @@ latest_pid = None current_successful_retries_in_a_row = 0 max_current_successful_retries_in_a_row = 0 - for retry in xrange(max_retries): + for retry in range(max_retries): pid = __salt__['service.status'](name=name, sig=sig) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/crio/init.sls new/salt-master/salt/crio/init.sls --- old/salt-master/salt/crio/init.sls 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/crio/init.sls 2018-05-25 11:42:05.000000000 +0200 @@ -18,13 +18,6 @@ - pkg: crio - file: /etc/crio/crio.conf -crio-reload-config: - service.running: - - name: crio - - reload: True - - onchanges: - - file: /etc/crio/crio.conf - /etc/systemd/system/kubelet.service.d/kubelet.conf: file.managed: - source: salt://crio/kubelet.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/docker/init.sls new/salt-master/salt/docker/init.sls --- old/salt-master/salt/docker/init.sls 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/docker/init.sls 2018-05-25 11:42:05.000000000 +0200 @@ -21,6 +21,8 @@ {{ cert | indent(8) }} - require_in: - docker + - onchanges_in: + - docker-reload-config {% endfor %} @@ -88,12 +90,7 @@ - /etc/sysconfig/docker docker-reload-config: - service.running: - - name: docker - - reload: True + cmd.run: + - name: systemctl reload docker - onchanges: - file: /etc/docker/daemon.json - {% for cert_tuple in certs.items() %} - {% set name, _cert = cert_tuple %} - - file: /etc/docker/certs.d/{{ name }}/ca.crt - {% endfor %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kubelet/kubelet.jinja new/salt-master/salt/kubelet/kubelet.jinja --- old/salt-master/salt/kubelet/kubelet.jinja 2018-05-22 02:05:02.000000000 +0200 +++ new/salt-master/salt/kubelet/kubelet.jinja 2018-05-25 11:42:05.000000000 +0200 @@ -52,7 +52,6 @@ --runtime-request-timeout=10m \ {% endif -%} --client-ca-file={{ pillar['ssl']['ca_file'] }} \ - --require-kubeconfig \ --network-plugin=cni \ --cni-bin-dir={{ pillar['cni']['dirs']['bin'] }} \ --cni-conf-dir={{ pillar['cni']['dirs']['conf'] }} \
