Hello community, here is the log from the commit of package kubernetes-salt for openSUSE:Factory checked in at 2018-06-20 15:35:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes-salt (Old) and /work/SRC/openSUSE:Factory/.kubernetes-salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes-salt" Wed Jun 20 15:35:02 2018 rev:27 rq:617896 version:4.0.0+git_r847_002982b Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes-salt/kubernetes-salt.changes 2018-06-15 14:46:38.635532904 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes-salt.new/kubernetes-salt.changes 2018-06-20 15:35:02.454055999 +0200 @@ -1,0 +2,57 @@ +Tue Jun 19 15:10:41 UTC 2018 - [email protected] + +- Commit 45b8f7b by Maximilian Meister [email protected] + explicitly pass unix_socket + + this affects only kubic for now where we use PyMySQL + + we cant use the MYSQL_UNIX_PORT workaround anymore as we could do with + MySQLdb + + salt#mysql-unix-socket + + Signed-off-by: Maximilian Meister <[email protected]> + + +------------------------------------------------------------------- +Mon Jun 18 14:16:54 UTC 2018 - [email protected] + +- Commit de8bd66 by Maximilian Meister [email protected] + override volume plugin dir (bsc#1084766) + + kubernetes 1.10 uses /usr/libexec by default which doesnt exist, and we want + to stick with /usr/lib + + Signed-off-by: Maximilian Meister <[email protected]> + + +------------------------------------------------------------------- +Mon Jun 18 10:53:37 UTC 2018 - [email protected] + +- Commit 5804349 by Alvaro Saurin [email protected] + Move the early services setup even before updating the masters (we can do + this by removing some unnecessary dependencies). + + bsc#1096992 + + +------------------------------------------------------------------- +Fri Jun 15 19:25:25 UTC 2018 - [email protected] + +- Commit ba20582 by Alvaro Saurin [email protected] + Try to load the manifests once we have at least one updated master. + + bsc#1096992 + + +------------------------------------------------------------------- +Fri Jun 15 15:19:41 UTC 2018 - [email protected] + +- Commit 180e545 by Alvaro Saurin [email protected] + Early setup some services on updates Removed "allowedFlexVolumes" in PSP (as + it doesn't pass the API verification in 2.1) + + bsc#1096992 + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes-salt.spec ++++++ --- /var/tmp/diff_new_pack.ZZEOHH/_old 2018-06-20 15:35:03.522017235 +0200 +++ /var/tmp/diff_new_pack.ZZEOHH/_new 2018-06-20 15:35:03.530016944 +0200 @@ -32,7 +32,7 @@ Name: kubernetes-salt %define gitrepo salt -Version: 4.0.0+git_r837_d08a652 +Version: 4.0.0+git_r847_002982b 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/config/master.d/50-returner.conf new/salt-master/config/master.d/50-returner.conf --- old/salt-master/config/master.d/50-returner.conf 2018-06-13 11:25:22.000000000 +0200 +++ new/salt-master/config/master.d/50-returner.conf 2018-06-19 17:12:12.000000000 +0200 @@ -1,8 +1,7 @@ mysql: - # salt does not support specifying the UNIX socket location here - as a workaround, - # use the MYSQL_UNIX_PORT environment variable used by libmysqlclient # you still need the 'host' value here, or it will use the defaults and try to connect # on a host named 'salt' host: 'localhost' user: 'salt' - db: 'velum_production' \ No newline at end of file + db: 'velum_production' + unix_socket: '/var/run/mysql/mysql.sock' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/init.sls new/salt-master/salt/addons/init.sls --- old/salt-master/salt/addons/init.sls 2018-06-13 11:25:22.000000000 +0200 +++ new/salt-master/salt/addons/init.sls 2018-06-19 17:12:12.000000000 +0200 @@ -1,7 +1,5 @@ include: - - kube-apiserver - kubectl-config - - cri /etc/kubernetes/addons: file.directory: @@ -9,8 +7,6 @@ - group: root - dir_mode: 755 - makedirs: True - - require: - - file: /etc/cni/net.d/87-podman-bridge.conflist {% from '_macros/kubectl.jinja' import kubectl_apply_template with context %} 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-06-13 11:25:22.000000000 +0200 +++ new/salt-master/salt/addons/psp/init.sls 2018-06-19 17:12:12.000000000 +0200 @@ -1,10 +1,9 @@ {% if salt.caasp_pillar.get('addons:psp', True) %} include: - - kube-apiserver - kubectl-config -{% from '_macros/kubectl.jinja' import kubectl, kubectl_apply_template, kubectl_apply_dir_template with context %} +{% from '_macros/kubectl.jinja' import kubectl_apply_dir_template with context %} {{ kubectl_apply_dir_template("salt://addons/psp/manifests/", "/etc/kubernetes/addons/psp/") }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-privileged.yaml new/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-privileged.yaml --- old/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-privileged.yaml 2018-06-13 11:25:22.000000000 +0200 +++ new/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-privileged.yaml 2018-06-19 17:12:12.000000000 +0200 @@ -38,7 +38,6 @@ - azureDisk - azureFile - vsphereVolume - allowedFlexVolumes: [] #allowedHostPaths: [] readOnlyRootFilesystem: false # Users and groups diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-unprivileged.yaml new/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-unprivileged.yaml --- old/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-unprivileged.yaml 2018-06-13 11:25:22.000000000 +0200 +++ new/salt-master/salt/addons/psp/manifests/10-podsecuritypolicy-unprivileged.yaml 2018-06-19 17:12:12.000000000 +0200 @@ -38,7 +38,6 @@ - azureDisk - azureFile - vsphereVolume - allowedFlexVolumes: [] allowedHostPaths: # Note: We don't allow hostPath volumes above, but set this to a path we # control anyway as a belt+braces protection. /dev/null may be a better diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/init.sls new/salt-master/salt/cni/init.sls --- old/salt-master/salt/cni/init.sls 2018-06-13 11:25:22.000000000 +0200 +++ new/salt-master/salt/cni/init.sls 2018-06-19 17:12:12.000000000 +0200 @@ -1,5 +1,4 @@ include: - - kube-apiserver - addons - kubectl-config @@ -24,7 +23,6 @@ - env: - KUBECONFIG: {{ pillar['paths']['kubeconfig'] }} - require: - - kube-apiserver - file: {{ pillar['paths']['kubeconfig'] }} - watch: - file: /etc/kubernetes/addons/kube-flannel-rbac.yaml @@ -42,7 +40,6 @@ - env: - KUBECONFIG: {{ pillar['paths']['kubeconfig'] }} - require: - - kube-apiserver - file: {{ pillar['paths']['kubeconfig'] }} - watch: - /etc/kubernetes/addons/kube-flannel-rbac.yaml @@ -69,7 +66,6 @@ - env: - KUBECONFIG: {{ pillar['paths']['kubeconfig'] }} - require: - - kube-apiserver - file: {{ pillar['paths']['kubeconfig'] }} - watch: - file: /etc/kubernetes/addons/cilium-config.yaml @@ -87,7 +83,6 @@ - env: - KUBECONFIG: {{ pillar['paths']['kubeconfig'] }} - require: - - kube-apiserver - file: {{ pillar['paths']['kubeconfig'] }} - watch: - file: /etc/kubernetes/addons/cilium-rbac.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/update-post-reboot.sls new/salt-master/salt/cni/update-post-reboot.sls --- old/salt-master/salt/cni/update-post-reboot.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/cni/update-post-reboot.sls 2018-06-19 17:12:12.000000000 +0200 @@ -0,0 +1,7 @@ + +/etc/cni/net.d/87-podman-bridge.conflist: + file.absent + # Has to be removed, otherwise kubernetes will use this CNI driver + # instead of the flannel one. + # Moreover, by doing that podman containers will be attached to the + # flannel network, which is useful for debugging. 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-06-13 11:25:22.000000000 +0200 +++ new/salt-master/salt/kubelet/kubelet.jinja 2018-06-19 17:12:12.000000000 +0200 @@ -55,4 +55,5 @@ --network-plugin=cni \ --cni-bin-dir={{ pillar['cni']['dirs']['bin'] }} \ --cni-conf-dir={{ pillar['cni']['dirs']['conf'] }} \ - --kubeconfig={{ pillar['paths']['kubelet_config'] }}" + --kubeconfig={{ pillar['paths']['kubelet_config'] }} \ + --volume-plugin-dir=/usr/lib/kubernetes/kubelet-plugins" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/orch/update.sls new/salt-master/salt/orch/update.sls --- old/salt-master/salt/orch/update.sls 2018-06-13 11:25:22.000000000 +0200 +++ new/salt-master/salt/orch/update.sls 2018-06-19 17:12:12.000000000 +0200 @@ -28,6 +28,7 @@ {%- set is_worker_tgt = is_responsive_node_tgt + ' and G@roles:kube-minion' %} {%- set is_updateable_master_tgt = is_updateable_tgt + ' and ' + is_master_tgt %} {%- set is_updateable_worker_tgt = is_updateable_tgt + ' and ' + is_worker_tgt %} + {%- set all_masters = salt.saltutil.runner('mine.get', tgt=is_master_tgt, fun='network.interfaces', tgt_type='compound').keys() %} {%- set super_master = all_masters|first %} @@ -147,6 +148,16 @@ - pre-orchestration-migration # END NOTE +early-services-setup: + salt.state: + - tgt: '{{ super_master }}' + - sls: + - addons + - addons.psp + - cni + - require: + - etcd-setup + # Get list of masters needing reboot {%- set masters = salt.saltutil.runner('mine.get', tgt=is_updateable_master_tgt, fun='network.interfaces', tgt_type='compound') %} {%- for master_id in masters.keys() %} @@ -163,7 +174,7 @@ - cri.stop - etcd.stop - require: - - etcd-setup + - early-services-setup # Perform any necessary migrations before services are shutdown {{ master_id }}-pre-reboot: @@ -205,6 +216,7 @@ - tgt: '{{ master_id }}' - sls: - etc-hosts.update-post-reboot + - cni.update-post-reboot - require: - {{ master_id }}-wait-for-start @@ -248,7 +260,7 @@ - cni.update-post-start-services - kubelet.update-post-start-services - require: - - etcd-setup + - early-services-setup {%- for master_id in masters.keys() %} - {{ master_id }}-reboot-needed-grain {%- endfor %} @@ -312,6 +324,7 @@ - tgt: '{{ worker_id }}' - sls: - etc-hosts.update-post-reboot + - cni.update-post-reboot - require: - {{ worker_id }}-wait-for-start @@ -398,9 +411,6 @@ salt.state: - tgt: '{{ super_master }}' - sls: - - addons - - addons.psp - - cni - addons.dns - addons.tiller - addons.dex
