Hello community, here is the log from the commit of package kubernetes-salt for openSUSE:Factory checked in at 2018-03-19 23:38:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes-salt (Old) and /work/SRC/openSUSE:Factory/.kubernetes-salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes-salt" Mon Mar 19 23:38:21 2018 rev:6 rq:588115 version:3.0.0+git_r650_e65e789 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes-salt/kubernetes-salt.changes 2018-03-16 10:45:16.848299820 +0100 +++ /work/SRC/openSUSE:Factory/.kubernetes-salt.new/kubernetes-salt.changes 2018-03-19 23:38:22.813349004 +0100 @@ -1,0 +2,55 @@ +Fri Mar 16 17:05:34 UTC 2018 - [email protected] + +- Commit 30b9ae5 by Kiall Mac Innes [email protected] + Dex: Delay liveness probe in addition to readiness probe + + Delay the liveness probe by 30 seconds, matching the readiness probe. + + +------------------------------------------------------------------- +Fri Mar 16 16:57:20 UTC 2018 - [email protected] + +- Commit 753978f by Rafael Fernández López [email protected] + Use complete host references on haproxy configuration + + This avoids an incompatibility on the admin node in which if the external + fqdn field matched any of the master nodes host, haproxy would be checking + 127.0.0.1:6444 for the apiserver for healthchecks. + + Now, we are using the internal infra domain suffix so we are sure we are + referring to the real /etc/hosts entry with the ip address of the target + machines. + + +------------------------------------------------------------------- +Fri Mar 16 16:56:19 UTC 2018 - [email protected] + +- Commit 9f06d7d by Rafael Fernández López [email protected] + PCRE grain expressions only allow the regexp on the value side. + + Fix PCRE grain query expressions so they are matching what we expect. + + ``` caasp-admin:~ # docker exec -it 06bf salt -P 'bootstrap_complete:.*' + cmd.run hostname admin: + caasp-admin 6b5cb85d20f94f6eb813449b228cfe13: + caasp-worker-1 4c0e4d31bc754369940ffcbae28e2f0a: + caasp-worker-0 cb92123fa85d4170807e0aa24573501b: + caasp-master-0 66d5844bc5f14d1480896b1bc234dd92: + caasp-master-1 3f3f505c6eb3464e8a08cc0ae6fbc8f4: + caasp-master-2 caasp-admin:~ # docker exec -it 06bf salt -P + 'bootstrap_.*:true' cmd.run hostname No minions matched the target. No + command was sent, no jid was assigned. ERROR: No return received + ``` + + +------------------------------------------------------------------- +Thu Mar 15 21:22:34 UTC 2018 - [email protected] + +- Commit afc91fe by Kiall Mac Innes [email protected] + Wipe out our /etc/hosts changes before reboot + + This ensures the systemd/wicked logic is unaffected by our /etc/hosts + changes. + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes-salt.spec ++++++ --- /var/tmp/diff_new_pack.bGJU80/_old 2018-03-19 23:38:23.453325918 +0100 +++ /var/tmp/diff_new_pack.bGJU80/_new 2018-03-19 23:38:23.457325773 +0100 @@ -32,7 +32,7 @@ Name: kubernetes-salt %define gitrepo salt -Version: 3.0.0+git_r642_292b025 +Version: 3.0.0+git_r650_e65e789 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/salt/_modules/caasp_etcd.py new/salt-master/salt/_modules/caasp_etcd.py --- old/salt-master/salt/_modules/caasp_etcd.py 2018-03-14 09:56:11.000000000 +0100 +++ new/salt-master/salt/_modules/caasp_etcd.py 2018-03-16 18:05:32.000000000 +0100 @@ -135,7 +135,9 @@ expr = '' expr += 'not G@roles:etcd' expr += ' and not G@roles:admin and not G@roles:ca' - expr += ' and not P@.*_in_progress:true' + expr += ' and not G@bootstrap_in_progress:true' + expr += ' and not G@update_in_progress:true' + expr += ' and not G@removal_in_progress:true' expr += ' and {}'.format(role) log.debug('CaaS: trying to find an etcd replacement with %s', expr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/dex/manifests/20-deployment.yaml new/salt-master/salt/addons/dex/manifests/20-deployment.yaml --- old/salt-master/salt/addons/dex/manifests/20-deployment.yaml 2018-03-14 09:56:11.000000000 +0100 +++ new/salt-master/salt/addons/dex/manifests/20-deployment.yaml 2018-03-16 18:05:32.000000000 +0100 @@ -68,6 +68,8 @@ scheme: HTTPS livenessProbe: + # Give Dex a little time to startup + initialDelaySeconds: 30 httpGet: path: /healthz port: https 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-03-14 09:56:11.000000000 +0100 +++ new/salt-master/salt/etc-hosts/init.sls 2018-03-16 18:05:32.000000000 +0100 @@ -2,6 +2,7 @@ {% if salt['grains.get']('virtual_subtype', None) != 'Docker' %} /etc/hosts: file.blockreplace: + # If markers are changed, also update etc-hosts/update-pre-reboot.sls - marker_start: "#-- start Salt-CaaSP managed hosts - DO NOT MODIFY --" - marker_end: "#-- end Salt-CaaSP managed hosts --" - source: salt://etc-hosts/hosts.jinja diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etc-hosts/update-post-reboot.sls new/salt-master/salt/etc-hosts/update-post-reboot.sls --- old/salt-master/salt/etc-hosts/update-post-reboot.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/etc-hosts/update-post-reboot.sls 2018-03-16 18:05:32.000000000 +0100 @@ -0,0 +1,2 @@ +include: + - etc-hosts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etc-hosts/update-pre-reboot.sls new/salt-master/salt/etc-hosts/update-pre-reboot.sls --- old/salt-master/salt/etc-hosts/update-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/etc-hosts/update-pre-reboot.sls 2018-03-16 18:05:32.000000000 +0100 @@ -0,0 +1,8 @@ +# Remove our /etc/hosts entries, so that Systemd/Wicked hostname +# logic doesn't pick up out /etc/hosts entry names. +/etc/hosts: + file.blockreplace: + # If markers are changed, also update etc-hosts/init.sls + - marker_start: "#-- start Salt-CaaSP managed hosts - DO NOT MODIFY --" + - marker_end: "#-- end Salt-CaaSP managed hosts --" + - content: "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/haproxy/haproxy.cfg.jinja new/salt-master/salt/haproxy/haproxy.cfg.jinja --- old/salt-master/salt/haproxy/haproxy.cfg.jinja 2018-03-14 09:56:11.000000000 +0100 +++ new/salt-master/salt/haproxy/haproxy.cfg.jinja 2018-03-16 18:05:32.000000000 +0100 @@ -27,7 +27,7 @@ option httpchk GET /healthz {%- for minion_id, nodename in salt['mine.get']('roles:kube-master', 'nodename', 'grain').items() %} - server master-{{ minion_id }} {{ nodename }}:{{ pillar['api']['int_ssl_port'] }} check check-ssl port {{ pillar['api']['int_ssl_port'] }} verify none + server master-{{ nodename }} {{ nodename }}.{{ pillar['internal_infra_domain'] }}:{{ pillar['api']['int_ssl_port'] }} check check-ssl port {{ pillar['api']['int_ssl_port'] }} verify none {% endfor -%} {%- if "admin" in salt['grains.get']('roles', []) %} @@ -40,7 +40,7 @@ option redispatch {%- for minion_id, nodename in salt['mine.get']('roles:kube-master', 'nodename', 'grain').items() %} - server master-{{ minion_id }} {{ nodename }}:32000 check + server master-{{ nodename }} {{ nodename }}.{{ pillar['internal_infra_domain'] }}:32000 check {% endfor %} listen velum diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/orch/removal.sls new/salt-master/salt/orch/removal.sls --- old/salt-master/salt/orch/removal.sls 2018-03-14 09:56:11.000000000 +0100 +++ new/salt-master/salt/orch/removal.sls 2018-03-16 18:05:32.000000000 +0100 @@ -381,7 +381,9 @@ {%- endif %} {%- set affected_expr = 'G@bootstrap_complete:true' + - ' and not P@.*_in_progress:true' + + ' and not G@bootstrap_in_progress:true' + + ' and not G@update_in_progress:true' + + ' and not G@removal_in_progress:true' + ' and P@roles:(' + affected_roles|join('|') + ')' + ' and not L@' + excluded_nodes|join(',') %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/orch/update-etc-hosts.sls new/salt-master/salt/orch/update-etc-hosts.sls --- old/salt-master/salt/orch/update-etc-hosts.sls 2018-03-14 09:56:11.000000000 +0100 +++ new/salt-master/salt/orch/update-etc-hosts.sls 2018-03-16 18:05:32.000000000 +0100 @@ -1,4 +1,4 @@ -{%- set updates_all_target = 'P@roles:(admin|kube-(master|minion)) and G@bootstrap_complete:true and not P@.*_in_progress:true' %} +{%- set updates_all_target = 'P@roles:(admin|kube-(master|minion)) and G@bootstrap_complete:true and not G@bootstrap_in_progress:true and not G@update_in_progress:true and not G@removal_in_progress:true' %} {%- if salt.saltutil.runner('mine.get', tgt=updates_all_target, fun='nodename', tgt_type='compound')|length > 0 %} update_pillar: 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-03-14 09:56:11.000000000 +0100 +++ new/salt-master/salt/orch/update.sls 2018-03-16 18:05:32.000000000 +0100 @@ -132,6 +132,7 @@ salt.state: - tgt: {{ master_id }} - sls: + - etc-hosts.update-pre-reboot - cni.update-pre-reboot - etcd.update-pre-reboot - require: @@ -159,6 +160,16 @@ - require: - {{ master_id }}-reboot +# Perform any migratrions necessary before salt starts doing +# "real work" again +{{ master_id }}-post-reboot: + salt.state: + - tgt: {{ master_id }} + - sls: + - etc-hosts.update-post-reboot + - require: + - {{ master_id }}-wait-for-start + # Early apply haproxy configuration {{ master_id }}-apply-haproxy: salt.state: @@ -166,7 +177,7 @@ - sls: - haproxy - require: - - {{ master_id }}-wait-for-start + - {{ master_id }}-post-reboot # Start services {{ master_id }}-start-services: @@ -224,6 +235,7 @@ salt.state: - tgt: {{ worker_id }} - sls: + - etc-hosts.update-pre-reboot - cni.update-pre-reboot - require: - {{ worker_id }}-clean-shutdown @@ -250,6 +262,16 @@ - require: - {{ worker_id }}-reboot +# Perform any migratrions necessary before salt starts doing +# "real work" again +{{ worker_id }}-post-reboot: + salt.state: + - tgt: {{ worker_id }} + - sls: + - etc-hosts.update-post-reboot + - require: + - {{ worker_id }}-wait-for-start + # Early apply haproxy configuration {{ worker_id }}-apply-haproxy: salt.state: @@ -257,7 +279,7 @@ - sls: - haproxy - require: - - {{ worker_id }}-wait-for-start + - {{ worker_id }}-post-reboot # Start services {{ worker_id }}-start-services:
