Hello community, here is the log from the commit of package kubernetes-salt for openSUSE:Factory checked in at 2018-05-10 15:50:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes-salt (Old) and /work/SRC/openSUSE:Factory/.kubernetes-salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubernetes-salt" Thu May 10 15:50:47 2018 rev:18 rq:605706 version:4.0.0+git_r757_3c2b52a Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes-salt/kubernetes-salt.changes 2018-05-08 13:37:58.368182689 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes-salt.new/kubernetes-salt.changes 2018-05-10 15:50:49.754120664 +0200 @@ -1,0 +2,31 @@ +Tue May 8 14:13:40 UTC 2018 - containers-bugowner@suse.de + +- Commit 964deee by Maximilian Meister mmeister@suse.de + add condition to KUBE_ADMISSION_CONTROL + + bsc#1092140 + + Signed-off-by: Maximilian Meister <mmeister@suse.de> + + Commit eaab500 by Maximilian Meister mmeister@suse.de + fix conflicting sls id's + + they need to be globally unique + + orch error happened when setting psp to false in params.sls + + partially fixes https://bugzilla.suse.com/show_bug.cgi?id=1092140 + + bsc#1092140 + + Signed-off-by: Maximilian Meister <mmeister@suse.de> + + +------------------------------------------------------------------- +Tue May 8 10:41:39 UTC 2018 - containers-bugowner@suse.de + +- Commit 843a9a4 by Jordi Massaguer Pla jmassaguerpla@suse.de + update version to 4.0.0+dev + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes-salt.spec ++++++ --- /var/tmp/diff_new_pack.kslxNG/_old 2018-05-10 15:50:50.474094276 +0200 +++ /var/tmp/diff_new_pack.kslxNG/_new 2018-05-10 15:50:50.478094128 +0200 @@ -32,7 +32,7 @@ Name: kubernetes-salt %define gitrepo salt -Version: 3.0.0+git_r752_f9c2358 +Version: 4.0.0+git_r757_3c2b52a 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/VERSION new/salt-master/VERSION --- old/salt-master/VERSION 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/VERSION 2018-05-08 16:14:27.000000000 +0200 @@ -1 +1 @@ -3.0.0+dev +4.0.0+dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/dns/init.sls new/salt-master/salt/addons/dns/init.sls --- old/salt-master/salt/addons/dns/init.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/addons/dns/init.sls 2018-05-08 16:14:27.000000000 +0200 @@ -17,7 +17,7 @@ {% else %} -dummy: +dns-dummy: cmd.run: - name: echo "DNS addon not enabled in config" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/psp/init.sls new/salt-master/salt/addons/psp/init.sls --- old/salt-master/salt/addons/psp/init.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/addons/psp/init.sls 2018-05-08 16:14:27.000000000 +0200 @@ -11,7 +11,7 @@ {% else %} -dummy: +psp-dummy: cmd.run: - name: echo "PSP addon not enabled in config" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/tiller/deployment-wait.sls new/salt-master/salt/addons/tiller/deployment-wait.sls --- old/salt-master/salt/addons/tiller/deployment-wait.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/addons/tiller/deployment-wait.sls 2018-05-08 16:14:27.000000000 +0200 @@ -6,7 +6,7 @@ {% else %} -dummy: +tiller-deployment-wait-dummy: cmd.run: - name: echo "Tiller addon not enabled in config" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/tiller/init.sls new/salt-master/salt/addons/tiller/init.sls --- old/salt-master/salt/addons/tiller/init.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/addons/tiller/init.sls 2018-05-08 16:14:27.000000000 +0200 @@ -21,7 +21,7 @@ {% else %} -dummy: +tiller-dummy: cmd.run: - name: echo "Tiller addon not enabled in config" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cleanup/remove-post-orchestration.sls new/salt-master/salt/cleanup/remove-post-orchestration.sls --- old/salt-master/salt/cleanup/remove-post-orchestration.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/cleanup/remove-post-orchestration.sls 2018-05-08 16:14:27.000000000 +0200 @@ -36,7 +36,7 @@ {%- if not (forced or target in k8s_nodes + etcd_members) %} {# Make suse we do not generate an empty file if target is not a etcd/master #} -dummy_step: +remove-post-orchestration-dummy: cmd.run: - name: "echo saltstack bug 14553" {%- endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/cilium/init.sls new/salt-master/salt/cni/cilium/init.sls --- old/salt-master/salt/cni/cilium/init.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/cni/cilium/init.sls 2018-05-08 16:14:27.000000000 +0200 @@ -15,7 +15,7 @@ {% else %} {# See https://github.com/saltstack/salt/issues/14553 #} -dummy_step: +cni-cilium-dummy: cmd.run: - name: "echo saltstack bug 14553" {% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etc-hosts/init.sls new/salt-master/salt/etc-hosts/init.sls --- old/salt-master/salt/etc-hosts/init.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/etc-hosts/init.sls 2018-05-08 16:14:27.000000000 +0200 @@ -10,7 +10,7 @@ - append_if_not_found: True {% else %} {# See https://github.com/saltstack/salt/issues/14553 #} -dummy_step: +etc-hosts-dummy: cmd.run: - name: "echo saltstack bug 14553" {% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etcd/update-pre-orchestration.sls new/salt-master/salt/etcd/update-pre-orchestration.sls --- old/salt-master/salt/etcd/update-pre-orchestration.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/etcd/update-pre-orchestration.sls 2018-05-08 16:14:27.000000000 +0200 @@ -17,7 +17,7 @@ {%- else %} {# See https://github.com/saltstack/salt/issues/14553 #} -dummy_step: +update-pre-orchestration-dummy: cmd.run: - name: "echo saltstack bug 14553" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etcd/update-pre-reboot.sls new/salt-master/salt/etcd/update-pre-reboot.sls --- old/salt-master/salt/etcd/update-pre-reboot.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/etcd/update-pre-reboot.sls 2018-05-08 16:14:27.000000000 +0200 @@ -17,7 +17,7 @@ {%- else %} {# See https://github.com/saltstack/salt/issues/14553 #} -dummy_step: +update-pre-reboot-dummy: cmd.run: - name: "echo saltstack bug 14553" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kube-apiserver/apiserver.jinja new/salt-master/salt/kube-apiserver/apiserver.jinja --- old/salt-master/salt/kube-apiserver/apiserver.jinja 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/kube-apiserver/apiserver.jinja 2018-05-08 16:14:27.000000000 +0200 @@ -5,6 +5,7 @@ # {% set cloud_provider = salt.caasp_pillar.get('cloud:provider') %} +{% set kube_admission_control = ['Initializers', 'NamespaceLifecycle', 'LimitRanger', 'ServiceAccount', 'NodeRestriction', 'PersistentVolumeLabel', 'DefaultStorageClass', 'ResourceQuota', 'DefaultTolerationSeconds'] %} # The address on the local server to listen to. KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1 --bind-address=0.0.0.0" @@ -23,7 +24,11 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range={{ pillar['services_cidr'] }}" # default admission control policies -KUBE_ADMISSION_CONTROL="--admission-control=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,NodeRestriction,PodSecurityPolicy,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds" +{% if salt.caasp_pillar.get('addons:psp', True) %} +KUBE_ADMISSION_CONTROL="--admission-control={{ (kube_admission_control + ['PodSecurityPolicy'])|join(',') }}" +{% else %} +KUBE_ADMISSION_CONTROL="--admission-control={{ kube_admission_control|join(',') }}" +{% endif %} # Add your own! KUBE_API_ARGS="--advertise-address={{ salt.caasp_net.get_primary_ip() }} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/transactional-update/init.sls new/salt-master/salt/transactional-update/init.sls --- old/salt-master/salt/transactional-update/init.sls 2018-05-07 11:18:58.000000000 +0200 +++ new/salt-master/salt/transactional-update/init.sls 2018-05-08 16:14:27.000000000 +0200 @@ -32,7 +32,7 @@ - file: /etc/systemd/system/transactional-update.timer.d/10-increase-update-speed.conf {% else %} {# See https://github.com/saltstack/salt/issues/14553 #} -transactional_update_dummy_step: +transactional-update-dummy: cmd.run: - name: "echo saltstack bug 14553" {% endif %}