Hello community, here is the log from the commit of package kubic-control for openSUSE:Factory checked in at 2020-07-24 09:52:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubic-control (Old) and /work/SRC/openSUSE:Factory/.kubic-control.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubic-control" Fri Jul 24 09:52:23 2020 rev:15 rq:821936 version:0.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kubic-control/kubic-control.changes 2020-07-06 16:18:03.193089928 +0200 +++ /work/SRC/openSUSE:Factory/.kubic-control.new.3592/kubic-control.changes 2020-07-24 09:53:28.913248977 +0200 @@ -1,0 +2,8 @@ +Mon Jul 20 15:13:13 UTC 2020 - Thorsten Kukuk <ku...@suse.com> + +- Update to version 0.10.1 + - Fix upgrading of kubelet version + - Remove workarounds for salt, breaks non-salt usage + - Add new parameter apiserver_cert_extra_sans + +------------------------------------------------------------------- Old: ---- kubic-control-0.10.0.tar.xz New: ---- kubic-control-0.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubic-control.spec ++++++ --- /var/tmp/diff_new_pack.Z4vBgO/_old 2020-07-24 09:53:29.597249699 +0200 +++ /var/tmp/diff_new_pack.Z4vBgO/_new 2020-07-24 09:53:29.601249703 +0200 @@ -17,7 +17,7 @@ Name: kubic-control -Version: 0.10.0 +Version: 0.10.1 Release: 0 Summary: Simple setup tool for kubernetes License: Apache-2.0 ++++++ kubic-control-0.10.0.tar.xz -> kubic-control-0.10.1.tar.xz ++++++ Binary files old/kubic-control-0.10.0/.git/index and new/kubic-control-0.10.1/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/.git/logs/HEAD new/kubic-control-0.10.1/.git/logs/HEAD --- old/kubic-control-0.10.0/.git/logs/HEAD 2020-07-02 14:27:01.900850816 +0200 +++ new/kubic-control-0.10.1/.git/logs/HEAD 2020-07-20 17:10:34.040444240 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 9057fe22abd1cae79b7de5bad967f3d09735820e Thorsten Kukuk <ku...@suse.com> 1593692821 +0200 clone: from https://github.com/thkukuk/kubic-control +0000000000000000000000000000000000000000 c46f1202cbaaa6adfbcccacb40c30ebbb4312ba8 Thorsten Kukuk <ku...@suse.com> 1595257834 +0200 clone: from https://github.com/thkukuk/kubic-control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/.git/logs/refs/heads/master new/kubic-control-0.10.1/.git/logs/refs/heads/master --- old/kubic-control-0.10.0/.git/logs/refs/heads/master 2020-07-02 14:27:01.900850816 +0200 +++ new/kubic-control-0.10.1/.git/logs/refs/heads/master 2020-07-20 17:10:34.040444240 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 9057fe22abd1cae79b7de5bad967f3d09735820e Thorsten Kukuk <ku...@suse.com> 1593692821 +0200 clone: from https://github.com/thkukuk/kubic-control +0000000000000000000000000000000000000000 c46f1202cbaaa6adfbcccacb40c30ebbb4312ba8 Thorsten Kukuk <ku...@suse.com> 1595257834 +0200 clone: from https://github.com/thkukuk/kubic-control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/.git/logs/refs/remotes/origin/HEAD new/kubic-control-0.10.1/.git/logs/refs/remotes/origin/HEAD --- old/kubic-control-0.10.0/.git/logs/refs/remotes/origin/HEAD 2020-07-02 14:27:01.900850816 +0200 +++ new/kubic-control-0.10.1/.git/logs/refs/remotes/origin/HEAD 2020-07-20 17:10:34.040444240 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 9057fe22abd1cae79b7de5bad967f3d09735820e Thorsten Kukuk <ku...@suse.com> 1593692821 +0200 clone: from https://github.com/thkukuk/kubic-control +0000000000000000000000000000000000000000 c46f1202cbaaa6adfbcccacb40c30ebbb4312ba8 Thorsten Kukuk <ku...@suse.com> 1595257834 +0200 clone: from https://github.com/thkukuk/kubic-control Binary files old/kubic-control-0.10.0/.git/objects/pack/pack-4169315a00c9bc68334f8dd5fe80cf6814754530.idx and new/kubic-control-0.10.1/.git/objects/pack/pack-4169315a00c9bc68334f8dd5fe80cf6814754530.idx differ Binary files old/kubic-control-0.10.0/.git/objects/pack/pack-4169315a00c9bc68334f8dd5fe80cf6814754530.pack and new/kubic-control-0.10.1/.git/objects/pack/pack-4169315a00c9bc68334f8dd5fe80cf6814754530.pack differ Binary files old/kubic-control-0.10.0/.git/objects/pack/pack-4c22eed32e82a1ef0ab6fb9de5803167a010313a.idx and new/kubic-control-0.10.1/.git/objects/pack/pack-4c22eed32e82a1ef0ab6fb9de5803167a010313a.idx differ Binary files old/kubic-control-0.10.0/.git/objects/pack/pack-4c22eed32e82a1ef0ab6fb9de5803167a010313a.pack and new/kubic-control-0.10.1/.git/objects/pack/pack-4c22eed32e82a1ef0ab6fb9de5803167a010313a.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/.git/packed-refs new/kubic-control-0.10.1/.git/packed-refs --- old/kubic-control-0.10.0/.git/packed-refs 2020-07-02 14:27:01.896850796 +0200 +++ new/kubic-control-0.10.1/.git/packed-refs 2020-07-20 17:10:34.040444240 +0200 @@ -1,8 +1,9 @@ # pack-refs with: peeled fully-peeled sorted -9057fe22abd1cae79b7de5bad967f3d09735820e refs/remotes/origin/master +c46f1202cbaaa6adfbcccacb40c30ebbb4312ba8 refs/remotes/origin/master b5d6fc06c3bc9a1a242ad8263a3d8e71eadf5521 refs/tags/0.7.0 11f0daf7e39c6c8ca826819b9fa230952c167fc4 refs/tags/v0.1.0 9057fe22abd1cae79b7de5bad967f3d09735820e refs/tags/v0.10.0 +c46f1202cbaaa6adfbcccacb40c30ebbb4312ba8 refs/tags/v0.10.1 02cfb06685013a9b6a38b31ab421c3b37f3ae3cb refs/tags/v0.2.0 6665a06488a12d17faf5d0e0d47295d6e96b8b3e refs/tags/v0.2.1 8753d28f8536fa50a7e9e5873348475a4a9652d5 refs/tags/v0.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/.git/refs/heads/master new/kubic-control-0.10.1/.git/refs/heads/master --- old/kubic-control-0.10.0/.git/refs/heads/master 2020-07-02 14:27:01.900850816 +0200 +++ new/kubic-control-0.10.1/.git/refs/heads/master 2020-07-20 17:10:34.040444240 +0200 @@ -1 +1 @@ -9057fe22abd1cae79b7de5bad967f3d09735820e +c46f1202cbaaa6adfbcccacb40c30ebbb4312ba8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/README.md new/kubic-control-0.10.1/README.md --- old/kubic-control-0.10.0/README.md 2020-07-02 14:27:01.900850816 +0200 +++ new/kubic-control-0.10.1/README.md 2020-07-20 17:10:34.040444240 +0200 @@ -178,6 +178,7 @@ * `--haproxy=<salt name>` Adjust haproxy configuration for multi-master setup via salt * `--pod-network=<flannel|cilium>` Pod network * `--adv-addr=<IPaddr>` IP address the API Server will advertise on + * `--apiserver_cert_extra_sans=<IPaddr>` additional IPs to add to the APIserver certificate * `--stage=<official|devel>` Specify to use the official images or from the devel project * kubeconfig - Download kubeconfig * `--output=<file>` - Where the kubeconfig file should be stored diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/VERSION new/kubic-control-0.10.1/VERSION --- old/kubic-control-0.10.0/VERSION 2020-07-02 14:27:01.900850816 +0200 +++ new/kubic-control-0.10.1/VERSION 2020-07-20 17:10:34.040444240 +0200 @@ -1 +1 @@ -0.10.0 +0.10.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/api/api.pb.go new/kubic-control-0.10.1/api/api.pb.go --- old/kubic-control-0.10.0/api/api.pb.go 2020-07-02 14:27:02.008851331 +0200 +++ new/kubic-control-0.10.1/api/api.pb.go 2020-07-20 17:10:34.116444640 +0200 @@ -37,7 +37,7 @@ func (m *StatusReply) String() string { return proto.CompactTextString(m) } func (*StatusReply) ProtoMessage() {} func (*StatusReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{0} + return fileDescriptor_api_2cee851efdc9d27b, []int{0} } func (m *StatusReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatusReply.Unmarshal(m, b) @@ -86,7 +86,7 @@ func (m *ListReply) String() string { return proto.CompactTextString(m) } func (*ListReply) ProtoMessage() {} func (*ListReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{1} + return fileDescriptor_api_2cee851efdc9d27b, []int{1} } func (m *ListReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListReply.Unmarshal(m, b) @@ -139,17 +139,18 @@ // stage of testing Stage string `protobuf:"bytes,6,opt,name=stage,proto3" json:"stage,omitempty"` // salt name of first master - FirstMaster string `protobuf:"bytes,7,opt,name=first_master,json=firstMaster,proto3" json:"first_master,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + FirstMaster string `protobuf:"bytes,7,opt,name=first_master,json=firstMaster,proto3" json:"first_master,omitempty"` + ApiserverCertExtraSans string `protobuf:"bytes,8,opt,name=apiserver_cert_extra_sans,json=apiserverCertExtraSans,proto3" json:"apiserver_cert_extra_sans,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *InitRequest) Reset() { *m = InitRequest{} } func (m *InitRequest) String() string { return proto.CompactTextString(m) } func (*InitRequest) ProtoMessage() {} func (*InitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{2} + return fileDescriptor_api_2cee851efdc9d27b, []int{2} } func (m *InitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitRequest.Unmarshal(m, b) @@ -218,6 +219,13 @@ return "" } +func (m *InitRequest) GetApiserverCertExtraSans() string { + if m != nil { + return m.ApiserverCertExtraSans + } + return "" +} + // The upgrade request type UpgradeRequest struct { KubernetesVersion string `protobuf:"bytes,1,opt,name=kubernetes_version,json=kubernetesVersion,proto3" json:"kubernetes_version,omitempty"` @@ -230,7 +238,7 @@ func (m *UpgradeRequest) String() string { return proto.CompactTextString(m) } func (*UpgradeRequest) ProtoMessage() {} func (*UpgradeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{3} + return fileDescriptor_api_2cee851efdc9d27b, []int{3} } func (m *UpgradeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpgradeRequest.Unmarshal(m, b) @@ -271,7 +279,7 @@ func (m *AddNodeRequest) String() string { return proto.CompactTextString(m) } func (*AddNodeRequest) ProtoMessage() {} func (*AddNodeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{4} + return fileDescriptor_api_2cee851efdc9d27b, []int{4} } func (m *AddNodeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddNodeRequest.Unmarshal(m, b) @@ -317,7 +325,7 @@ func (m *RemoveNodeRequest) String() string { return proto.CompactTextString(m) } func (*RemoveNodeRequest) ProtoMessage() {} func (*RemoveNodeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{5} + return fileDescriptor_api_2cee851efdc9d27b, []int{5} } func (m *RemoveNodeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveNodeRequest.Unmarshal(m, b) @@ -356,7 +364,7 @@ func (m *RebootNodeRequest) String() string { return proto.CompactTextString(m) } func (*RebootNodeRequest) ProtoMessage() {} func (*RebootNodeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{6} + return fileDescriptor_api_2cee851efdc9d27b, []int{6} } func (m *RebootNodeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RebootNodeRequest.Unmarshal(m, b) @@ -394,7 +402,7 @@ func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{7} + return fileDescriptor_api_2cee851efdc9d27b, []int{7} } func (m *Version) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Version.Unmarshal(m, b) @@ -431,7 +439,7 @@ func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{8} + return fileDescriptor_api_2cee851efdc9d27b, []int{8} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -462,7 +470,7 @@ func (m *CreateCertRequest) String() string { return proto.CompactTextString(m) } func (*CreateCertRequest) ProtoMessage() {} func (*CreateCertRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{9} + return fileDescriptor_api_2cee851efdc9d27b, []int{9} } func (m *CreateCertRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateCertRequest.Unmarshal(m, b) @@ -505,7 +513,7 @@ func (m *CertificateReply) String() string { return proto.CompactTextString(m) } func (*CertificateReply) ProtoMessage() {} func (*CertificateReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{10} + return fileDescriptor_api_2cee851efdc9d27b, []int{10} } func (m *CertificateReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CertificateReply.Unmarshal(m, b) @@ -565,7 +573,7 @@ func (m *DeployKustomizeRequest) String() string { return proto.CompactTextString(m) } func (*DeployKustomizeRequest) ProtoMessage() {} func (*DeployKustomizeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{11} + return fileDescriptor_api_2cee851efdc9d27b, []int{11} } func (m *DeployKustomizeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeployKustomizeRequest.Unmarshal(m, b) @@ -617,7 +625,7 @@ func (m *PrepareConfigRequest) String() string { return proto.CompactTextString(m) } func (*PrepareConfigRequest) ProtoMessage() {} func (*PrepareConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{12} + return fileDescriptor_api_2cee851efdc9d27b, []int{12} } func (m *PrepareConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PrepareConfigRequest.Unmarshal(m, b) @@ -697,7 +705,7 @@ func (m *InstallRequest) String() string { return proto.CompactTextString(m) } func (*InstallRequest) ProtoMessage() {} func (*InstallRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_fd7325905b4b9543, []int{13} + return fileDescriptor_api_2cee851efdc9d27b, []int{13} } func (m *InstallRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InstallRequest.Unmarshal(m, b) @@ -1529,57 +1537,59 @@ Metadata: "api.proto", } -func init() { proto.RegisterFile("api.proto", fileDescriptor_api_fd7325905b4b9543) } +func init() { proto.RegisterFile("api.proto", fileDescriptor_api_2cee851efdc9d27b) } -var fileDescriptor_api_fd7325905b4b9543 = []byte{ - // 775 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x5d, 0x4f, 0x1b, 0x39, - 0x14, 0x25, 0x1b, 0x20, 0x99, 0x9b, 0x25, 0x10, 0x2f, 0x8b, 0x86, 0xec, 0xae, 0x96, 0x9d, 0xd5, - 0x6a, 0x59, 0x69, 0x41, 0x25, 0xe5, 0xa1, 0xaa, 0xd4, 0x0f, 0x1a, 0xda, 0x0a, 0x41, 0xa3, 0x6a, - 0x10, 0x95, 0xfa, 0x14, 0x39, 0x99, 0x9b, 0xe0, 0x26, 0x33, 0x9e, 0xda, 0x9e, 0xb4, 0xe9, 0x43, - 0xff, 0x5a, 0x7f, 0x50, 0x5f, 0xfb, 0x03, 0x2a, 0x7b, 0x3c, 0x93, 0x04, 0x12, 0x41, 0x79, 0xca, - 0xbd, 0xc7, 0x3e, 0xd7, 0xd7, 0x9e, 0x73, 0x6e, 0xc0, 0xa1, 0x31, 0xdb, 0x8f, 0x05, 0x57, 0x9c, - 0x14, 0x69, 0xcc, 0xbc, 0x23, 0xa8, 0x9c, 0x2b, 0xaa, 0x12, 0xe9, 0x63, 0x3c, 0x1c, 0x13, 0x17, - 0x4a, 0x32, 0xe9, 0x76, 0x51, 0x4a, 0xb7, 0xb0, 0x53, 0xd8, 0x2d, 0xfb, 0x59, 0xaa, 0x57, 0x42, - 0x94, 0x92, 0xf6, 0xd1, 0xfd, 0x69, 0xa7, 0xb0, 0xeb, 0xf8, 0x59, 0xea, 0x9d, 0x83, 0x73, 0xc6, - 0xa4, 0xba, 0x73, 0x01, 0x42, 0x60, 0x39, 0xe2, 0x01, 0xba, 0xc5, 0x9d, 0xe2, 0xae, 0xe3, 0x9b, - 0xd8, 0xfb, 0x56, 0x80, 0xca, 0x49, 0xc4, 0x94, 0x8f, 0xef, 0x13, 0x94, 0x8a, 0xec, 0x01, 0x19, - 0x24, 0x1d, 0x14, 0x11, 0x2a, 0x94, 0xed, 0x11, 0x0a, 0xc9, 0x78, 0x64, 0x8e, 0x70, 0xfc, 0xda, - 0x64, 0xe5, 0x4d, 0xba, 0x40, 0xfe, 0x81, 0x6a, 0xcc, 0x83, 0x76, 0x84, 0xea, 0x03, 0x17, 0x03, - 0x16, 0xf5, 0xed, 0x99, 0x6b, 0x31, 0x0f, 0x5a, 0x39, 0x48, 0xb6, 0xa1, 0x4c, 0x83, 0x51, 0x9b, - 0x06, 0x81, 0x70, 0x8b, 0x69, 0x53, 0x34, 0x18, 0x1d, 0x05, 0x81, 0x20, 0x7f, 0xc1, 0xcf, 0x61, - 0x32, 0x54, 0xac, 0x1d, 0x52, 0xa9, 0x50, 0xb8, 0xcb, 0x66, 0xb9, 0x62, 0xb0, 0x57, 0x06, 0xd2, - 0x37, 0xba, 0xa4, 0xb1, 0xe0, 0x1f, 0xc7, 0xee, 0x4a, 0x4a, 0xb6, 0x29, 0xd9, 0x84, 0x15, 0xa9, - 0xf4, 0x4d, 0x57, 0x0d, 0x9e, 0x26, 0xba, 0x64, 0x8f, 0x09, 0xa9, 0xb2, 0x92, 0xa5, 0xb4, 0xa4, - 0xc1, 0xd2, 0x92, 0xde, 0x13, 0xa8, 0x5e, 0xc4, 0x7d, 0x41, 0x03, 0xbc, 0xdb, 0xc5, 0xbd, 0x26, - 0x54, 0x8f, 0x82, 0xa0, 0xc5, 0x27, 0x05, 0xfe, 0x00, 0xd0, 0x2f, 0xda, 0x8e, 0x68, 0x88, 0xd2, - 0x12, 0x1d, 0x8d, 0xb4, 0x34, 0xa0, 0x1f, 0x5f, 0x8d, 0xe3, 0xec, 0x9b, 0x98, 0xd8, 0x6b, 0x40, - 0xcd, 0xc7, 0x90, 0x8f, 0xf0, 0xf6, 0x75, 0x52, 0x4e, 0x87, 0x73, 0xf5, 0x03, 0x9c, 0xbf, 0xa1, - 0x94, 0x7d, 0x30, 0x17, 0x4a, 0xb3, 0x77, 0xcb, 0x52, 0xaf, 0x04, 0x2b, 0xcf, 0xc3, 0x58, 0x8d, - 0xbd, 0x7f, 0xa1, 0xd6, 0x14, 0x48, 0x15, 0x36, 0x51, 0xe4, 0xba, 0xd0, 0xda, 0xa1, 0x21, 0x5a, - 0x92, 0x89, 0xbd, 0x77, 0xb0, 0xa1, 0xb7, 0xb0, 0x1e, 0xeb, 0x52, 0x85, 0x77, 0xd7, 0xe5, 0x06, - 0x14, 0x07, 0x38, 0xb6, 0xc2, 0xd0, 0xa1, 0x46, 0xba, 0x42, 0x59, 0x2d, 0xe8, 0xd0, 0x6b, 0xc1, - 0xd6, 0x31, 0xc6, 0x43, 0x3e, 0x3e, 0x4d, 0xa4, 0xe2, 0x21, 0xfb, 0x94, 0xdf, 0x5d, 0x9f, 0x88, - 0x62, 0xc4, 0xba, 0x59, 0x73, 0x59, 0x4a, 0xea, 0x50, 0xa6, 0xa2, 0x9f, 0x84, 0x18, 0x29, 0x7b, - 0x64, 0x9e, 0x7b, 0x5f, 0x0a, 0xb0, 0xf9, 0x5a, 0x60, 0x4c, 0x05, 0x36, 0x79, 0xd4, 0x63, 0xfd, - 0xac, 0x5c, 0x1d, 0xca, 0x92, 0x0e, 0x95, 0x31, 0x4a, 0x5a, 0x2f, 0xcf, 0xe7, 0x7d, 0x43, 0xdd, - 0x2a, 0xf6, 0x98, 0x69, 0xbe, 0xe6, 0xeb, 0x90, 0xfc, 0x0e, 0x4e, 0x87, 0x0a, 0x0c, 0x51, 0xd1, - 0xa1, 0xb9, 0x42, 0xcd, 0x9f, 0x00, 0xba, 0x46, 0xc0, 0xe4, 0xc0, 0x2a, 0xd9, 0xc4, 0x1a, 0x13, - 0x18, 0x73, 0xab, 0x62, 0x13, 0x93, 0x3f, 0xa1, 0xa2, 0x7f, 0xdb, 0x49, 0x1c, 0x50, 0x85, 0x56, - 0xc3, 0xa0, 0xa1, 0x0b, 0x83, 0x78, 0xff, 0x43, 0xf5, 0x24, 0x92, 0x8a, 0x0e, 0x87, 0xb7, 0x68, - 0xbd, 0xf1, 0xb5, 0x08, 0xa5, 0xd3, 0xa4, 0x83, 0x34, 0x08, 0xc9, 0x21, 0x80, 0xb6, 0xbc, 0x75, - 0xd7, 0xc6, 0xbe, 0x1e, 0x55, 0x53, 0x33, 0xa0, 0x9e, 0x22, 0x53, 0xe3, 0xca, 0x5b, 0xba, 0x57, - 0x20, 0x87, 0x50, 0xb2, 0x8a, 0x27, 0xbf, 0x98, 0x0d, 0xb3, 0xfa, 0x5f, 0xc0, 0x7a, 0x08, 0x30, - 0x91, 0x38, 0xd9, 0x32, 0x7b, 0xae, 0x69, 0x7e, 0x01, 0xf7, 0x81, 0xe6, 0x66, 0x52, 0xcf, 0xb9, - 0x57, 0xb4, 0x3f, 0x8f, 0x4b, 0xfe, 0x4b, 0x47, 0xa5, 0xde, 0x26, 0x09, 0x98, 0x0d, 0x46, 0xdb, - 0xf5, 0xaa, 0x89, 0xf3, 0x31, 0xea, 0x2d, 0x91, 0x03, 0x58, 0x3b, 0x46, 0xa9, 0x04, 0x1f, 0xdb, - 0xf7, 0x98, 0xde, 0x3e, 0xbf, 0xaf, 0xc7, 0x50, 0xb3, 0xc3, 0xe3, 0x34, 0x9f, 0x0b, 0xf6, 0x4d, - 0x66, 0x87, 0xca, 0x02, 0xfe, 0x01, 0xac, 0xbf, 0x40, 0xd5, 0xbd, 0xd4, 0xec, 0xae, 0x11, 0xdf, - 0x4d, 0x87, 0x92, 0x3d, 0x70, 0x5e, 0xa2, 0x4a, 0xb1, 0x9b, 0x3b, 0x6c, 0x9c, 0x41, 0x65, 0xca, - 0x99, 0xe4, 0x11, 0xc0, 0xc4, 0xd1, 0xf6, 0x21, 0xaf, 0x59, 0xbc, 0xfe, 0x6b, 0x8a, 0x5f, 0x71, - 0xb4, 0xb7, 0xd4, 0x38, 0x83, 0xd5, 0xd4, 0x7b, 0xe4, 0x19, 0xac, 0x5f, 0x71, 0x21, 0xf9, 0xcd, - 0xb0, 0xe6, 0x7b, 0x73, 0x5e, 0x77, 0x8d, 0xcf, 0xb0, 0xfc, 0x96, 0x87, 0x8c, 0x3c, 0x85, 0xb5, - 0x19, 0x03, 0x92, 0x6d, 0xb3, 0x79, 0x9e, 0x29, 0x17, 0x2b, 0xd2, 0x3a, 0xc0, 0xbe, 0xfe, 0xac, - 0x1f, 0xe6, 0xb3, 0x3a, 0xab, 0xe6, 0x5f, 0xf9, 0xfe, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, - 0xb4, 0x64, 0x4d, 0xa2, 0x07, 0x00, 0x00, +var fileDescriptor_api_2cee851efdc9d27b = []byte{ + // 807 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x6f, 0x4f, 0x3b, 0x45, + 0x10, 0xa6, 0x14, 0x68, 0x6f, 0x2a, 0x85, 0xae, 0x48, 0x8e, 0xaa, 0x11, 0xcf, 0x18, 0x31, 0x11, + 0x22, 0x95, 0x17, 0x6a, 0xe2, 0x1f, 0x2c, 0x68, 0x08, 0xd8, 0x98, 0x23, 0x98, 0xf8, 0xea, 0xb2, + 0xbd, 0x9b, 0x96, 0xb5, 0xbd, 0xdb, 0x73, 0x77, 0xaf, 0x52, 0x5f, 0xf8, 0x95, 0xfc, 0x08, 0x7e, + 0x20, 0xbf, 0x84, 0xd9, 0xbd, 0xbd, 0x6b, 0x0b, 0x6d, 0xe0, 0xc7, 0xab, 0x9b, 0x79, 0x76, 0x66, + 0x76, 0x76, 0xf7, 0x79, 0xe6, 0xc0, 0xa1, 0x29, 0x3b, 0x49, 0x05, 0x57, 0x9c, 0x54, 0x69, 0xca, + 0xbc, 0x73, 0x68, 0xdc, 0x2a, 0xaa, 0x32, 0xe9, 0x63, 0x3a, 0x9e, 0x12, 0x17, 0x6a, 0x32, 0x0b, + 0x43, 0x94, 0xd2, 0xad, 0x1c, 0x56, 0x8e, 0xea, 0x7e, 0xe1, 0xea, 0x95, 0x18, 0xa5, 0xa4, 0x43, + 0x74, 0xd7, 0x0f, 0x2b, 0x47, 0x8e, 0x5f, 0xb8, 0xde, 0x2d, 0x38, 0x37, 0x4c, 0xaa, 0x57, 0x17, + 0x20, 0x04, 0x36, 0x12, 0x1e, 0xa1, 0x5b, 0x3d, 0xac, 0x1e, 0x39, 0xbe, 0xb1, 0xbd, 0x7f, 0xd6, + 0xa1, 0x71, 0x95, 0x30, 0xe5, 0xe3, 0x1f, 0x19, 0x4a, 0x45, 0x8e, 0x81, 0x8c, 0xb2, 0x3e, 0x8a, + 0x04, 0x15, 0xca, 0x60, 0x82, 0x42, 0x32, 0x9e, 0x98, 0x2d, 0x1c, 0xbf, 0x35, 0x5b, 0xf9, 0x35, + 0x5f, 0x20, 0x1f, 0x43, 0x33, 0xe5, 0x51, 0x90, 0xa0, 0xfa, 0x93, 0x8b, 0x11, 0x4b, 0x86, 0x76, + 0xcf, 0xed, 0x94, 0x47, 0xbd, 0x12, 0x24, 0x07, 0x50, 0xa7, 0xd1, 0x24, 0xa0, 0x51, 0x24, 0xdc, + 0x6a, 0xde, 0x14, 0x8d, 0x26, 0xe7, 0x51, 0x24, 0xc8, 0x87, 0xf0, 0x56, 0x9c, 0x8d, 0x15, 0x0b, + 0x62, 0x2a, 0x15, 0x0a, 0x77, 0xc3, 0x2c, 0x37, 0x0c, 0xf6, 0xb3, 0x81, 0xf4, 0x89, 0xee, 0x69, + 0x2a, 0xf8, 0xc3, 0xd4, 0xdd, 0xcc, 0x93, 0xad, 0x4b, 0xf6, 0x60, 0x53, 0x2a, 0x7d, 0xd2, 0x2d, + 0x83, 0xe7, 0x8e, 0x2e, 0x39, 0x60, 0x42, 0xaa, 0xa2, 0x64, 0x2d, 0x2f, 0x69, 0x30, 0x5b, 0xf2, + 0x2b, 0x38, 0xa0, 0x29, 0x93, 0x28, 0x26, 0x28, 0x82, 0x10, 0x85, 0x0a, 0xf0, 0x41, 0x09, 0x1a, + 0x48, 0x9a, 0x48, 0xb7, 0x6e, 0xe2, 0xf7, 0xcb, 0x80, 0x2e, 0x0a, 0x75, 0xa9, 0x97, 0x6f, 0x69, + 0x22, 0xbd, 0xef, 0xa0, 0x79, 0x97, 0x0e, 0x05, 0x8d, 0xf0, 0x75, 0x77, 0xe6, 0x75, 0xa1, 0x79, + 0x1e, 0x45, 0x3d, 0x3e, 0x2b, 0xf0, 0x3e, 0x80, 0x7e, 0x8c, 0x20, 0xa1, 0x31, 0x4a, 0x9b, 0xe8, + 0x68, 0xa4, 0xa7, 0x01, 0xfd, 0x6e, 0x6a, 0x9a, 0x16, 0xcf, 0x69, 0x6c, 0xaf, 0x03, 0x2d, 0x1f, + 0x63, 0x3e, 0xc1, 0x97, 0xd7, 0xc9, 0x73, 0xfa, 0x9c, 0xab, 0x37, 0xc8, 0xf9, 0x08, 0x6a, 0xc5, + 0x5b, 0xbb, 0x50, 0x5b, 0x3c, 0x5b, 0xe1, 0x7a, 0x35, 0xd8, 0xbc, 0x8c, 0x53, 0x35, 0xf5, 0x3e, + 0x81, 0x56, 0x57, 0x20, 0x55, 0xa8, 0xaf, 0xac, 0xd8, 0x41, 0xd3, 0x8e, 0xc6, 0x68, 0x93, 0x8c, + 0xed, 0xfd, 0x0e, 0xbb, 0x3a, 0x84, 0x0d, 0x58, 0x48, 0x15, 0xbe, 0x9e, 0xd2, 0xbb, 0x50, 0x1d, + 0xe1, 0xd4, 0x72, 0x4a, 0x9b, 0x1a, 0x09, 0x85, 0xb2, 0x34, 0xd2, 0xa6, 0xd7, 0x83, 0xfd, 0x0b, + 0x4c, 0xc7, 0x7c, 0x7a, 0x9d, 0x49, 0xc5, 0x63, 0xf6, 0x57, 0x79, 0x76, 0xbd, 0x23, 0x8a, 0x09, + 0x0b, 0x8b, 0xe6, 0x0a, 0x97, 0xb4, 0xa1, 0x4e, 0xc5, 0x30, 0x8b, 0x31, 0x51, 0x76, 0xcb, 0xd2, + 0xf7, 0xfe, 0xad, 0xc0, 0xde, 0x2f, 0x02, 0x53, 0x2a, 0xb0, 0xcb, 0x93, 0x01, 0x1b, 0x16, 0xe5, + 0xda, 0x50, 0x97, 0x74, 0xac, 0x8c, 0xc6, 0xf2, 0x7a, 0xa5, 0xbf, 0xec, 0x0d, 0x75, 0xab, 0x38, + 0x60, 0xa6, 0xf9, 0x96, 0xaf, 0x4d, 0xf2, 0x1e, 0x38, 0x7d, 0x2a, 0x30, 0x46, 0x45, 0xc7, 0xe6, + 0x08, 0x2d, 0x7f, 0x06, 0xe8, 0x1a, 0x11, 0x93, 0x23, 0x2b, 0x02, 0x63, 0x6b, 0x4c, 0x60, 0xca, + 0xad, 0x00, 0x8c, 0x4d, 0x3e, 0x80, 0x86, 0xfe, 0x06, 0x59, 0x1a, 0x51, 0x85, 0x96, 0xfe, 0xa0, + 0xa1, 0x3b, 0x83, 0x78, 0x9f, 0x41, 0xf3, 0x2a, 0x91, 0x8a, 0x8e, 0xc7, 0x2f, 0x68, 0xbd, 0xf3, + 0x5f, 0x15, 0x6a, 0xd7, 0x59, 0x1f, 0x69, 0x14, 0x93, 0x33, 0x00, 0x3d, 0x2d, 0xac, 0x8a, 0x76, + 0x4f, 0xf4, 0x94, 0x9b, 0x1b, 0x1f, 0xed, 0x1c, 0x99, 0x9b, 0x74, 0xde, 0xda, 0xe7, 0x15, 0x72, + 0x06, 0x35, 0xcb, 0x78, 0xf2, 0xb6, 0x09, 0x58, 0xe4, 0xff, 0x8a, 0xac, 0xaf, 0x01, 0x66, 0x14, + 0x27, 0xfb, 0x26, 0xe6, 0x09, 0xe7, 0x57, 0xe4, 0x7e, 0xa9, 0x73, 0x0b, 0xaa, 0x97, 0xb9, 0x8f, + 0xb8, 0xbf, 0x2c, 0x97, 0x7c, 0x9a, 0x4f, 0x59, 0x1d, 0x26, 0x09, 0x98, 0x00, 0xc3, 0xed, 0x76, + 0xd3, 0xd8, 0xe5, 0x04, 0xf6, 0xd6, 0xc8, 0x29, 0x6c, 0x5f, 0xa0, 0x54, 0x82, 0x4f, 0xed, 0x7d, + 0xcc, 0x87, 0x2f, 0xef, 0xeb, 0x5b, 0x68, 0xd9, 0xe1, 0x71, 0x5d, 0xce, 0x05, 0x7b, 0x27, 0x8b, + 0x43, 0x65, 0x45, 0xfe, 0x29, 0xec, 0xfc, 0x88, 0x2a, 0xbc, 0xd7, 0xd9, 0xa1, 0x21, 0xdf, 0x73, + 0x9b, 0x92, 0x63, 0x70, 0x7e, 0x42, 0x95, 0x63, 0xcf, 0x77, 0xd8, 0xb9, 0x81, 0xc6, 0x9c, 0x32, + 0xc9, 0x37, 0x00, 0x33, 0x45, 0xdb, 0x8b, 0x7c, 0x22, 0xf1, 0xf6, 0x3b, 0x39, 0xfe, 0x48, 0xd1, + 0xde, 0x5a, 0xe7, 0x06, 0xb6, 0x72, 0xed, 0x91, 0x1f, 0x60, 0xe7, 0x91, 0x0a, 0xc9, 0xbb, 0x26, + 0x6b, 0xb9, 0x36, 0x97, 0x75, 0xd7, 0xf9, 0x1b, 0x36, 0x7e, 0xe3, 0x31, 0x23, 0xdf, 0xc3, 0xf6, + 0x82, 0x00, 0xc9, 0x81, 0x09, 0x5e, 0x26, 0xca, 0xd5, 0x8c, 0xb4, 0x0a, 0xb0, 0xb7, 0xbf, 0xa8, + 0x87, 0xe5, 0x59, 0xfd, 0x2d, 0xf3, 0x43, 0xff, 0xe2, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe1, + 0xea, 0x4c, 0x56, 0xdd, 0x07, 0x00, 0x00, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/api/api.proto new/kubic-control-0.10.1/api/api.proto --- old/kubic-control-0.10.0/api/api.proto 2020-07-02 14:27:01.900850816 +0200 +++ new/kubic-control-0.10.1/api/api.proto 2020-07-20 17:10:34.040444240 +0200 @@ -63,6 +63,7 @@ string stage = 6; // salt name of first master string first_master = 7; + string apiserver_cert_extra_sans = 8; } // The upgrade request diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/pkg/kubeadm/addNode.go new/kubic-control-0.10.1/pkg/kubeadm/addNode.go --- old/kubic-control-0.10.0/pkg/kubeadm/addNode.go 2020-07-02 14:27:01.904850835 +0200 +++ new/kubic-control-0.10.1/pkg/kubeadm/addNode.go 2020-07-20 17:10:34.044444260 +0200 @@ -42,7 +42,7 @@ stream.Send(&pb.StatusReply{Success: true, Message: "Generate new token ..."}) log.Info("Token to join nodes too old, creating new one") - success, token := executeCmdSalt(master_salt, "kubeadm", "token", "create", "--print-join-command", "2>/dev/null") + success, token := executeCmdSalt(master_salt, "kubeadm", "token", "create", "--print-join-command") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: token}); err != nil { return err @@ -69,7 +69,7 @@ joincmd = joincmd + " --control-plane" stream.Send(&pb.StatusReply{Success: true, Message: "Upload certificates ..."}) - success, lines := executeCmdSalt(master_salt, "kubeadm", "init", "phase", "upload-certs", "--upload-certs", "2>/dev/null") + success, lines := executeCmdSalt(master_salt, "kubeadm", "init", "phase", "upload-certs", "--upload-certs") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: lines}); err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/pkg/kubeadm/initMaster.go new/kubic-control-0.10.1/pkg/kubeadm/initMaster.go --- old/kubic-control-0.10.0/pkg/kubeadm/initMaster.go 2020-07-02 14:27:01.904850835 +0200 +++ new/kubic-control-0.10.1/pkg/kubeadm/initMaster.go 2020-07-20 17:10:34.044444260 +0200 @@ -209,6 +209,10 @@ kubeadm_args = append(kubeadm_args, "--apiserver-advertise-address=" + in.AdvAddr) } + if len(in.ApiserverCertExtraSans) > 0 { + kubeadm_args = append(kubeadm_args, "--apiserver-cert-extra-sans=" + in.ApiserverCertExtraSans) + } + if strings.EqualFold(arg_pod_network, "flannel") { kubeadm_args = append(kubeadm_args, "--pod-network-cidr=10.244.0.0/16") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/pkg/kubeadm/upgradeKubernetes.go new/kubic-control-0.10.1/pkg/kubeadm/upgradeKubernetes.go --- old/kubic-control-0.10.0/pkg/kubeadm/upgradeKubernetes.go 2020-07-02 14:27:01.904850835 +0200 +++ new/kubic-control-0.10.1/pkg/kubeadm/upgradeKubernetes.go 2020-07-20 17:10:34.044444260 +0200 @@ -83,8 +83,13 @@ uncordon(stream, hostname) return nil } + // strip down kubernetes_version to get kubelet major version + // for openSUSE Kubic (from "v1.18.6" to "1.18") + kubelet_version := kubernetes_version[1:] + kubelet_version = kubelet_version[:strings.LastIndex(kubelet_version, ".")] + // Update kubelet - success, message = executeCmdSalt(firstMaster, "sed", "-i", "'s/KUBELET_VER=1.17/KUBELET_VER=1.18/'", "/etc/sysconfig/kubelet") + success, message = executeCmdSalt(firstMaster, "sed", "-i", "s/KUBELET_VER=.*/KUBELET_VER="+kubelet_version+"/", "/etc/sysconfig/kubelet") if success != true { if err := stream.Send(&pb.StatusReply{Success: success, Message: message}); err != nil { uncordon(stream, hostname) @@ -117,6 +122,11 @@ return "", nil } + // strip down kubernetes_version to get kubelet major version + // for openSUSE Kubic (from "v1.18.6" to "1.18") + kubelet_version := kubernetes_version[1:] + kubelet_version = kubelet_version[:strings.LastIndex(kubelet_version, ".")] + var failedNodes = "" for i := range nodelist { if err := stream.Send(&pb.StatusReply{Success: true, Message: "Upgrade "+nodelist[i]+"..."}); err != nil { @@ -136,7 +146,7 @@ } else { // Update kubelet success, message = tools.ExecuteCmd("salt", nodelist[i], "cmd.run", - "\"sed -i 's/KUBELET_VER=1.17/KUBELET_VER=1.18/' /etc/sysconfig/kubelet\"") + "\"sed -i s/KUBELET_VER=.*/KUBELET_VER="+kubelet_version+"/ /etc/sysconfig/kubelet\"") if success != true { failedNodes = failedNodes+nodelist[i]+" (kubelet_ver), " } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.10.0/pkg/kubicctl/initMaster.go new/kubic-control-0.10.1/pkg/kubicctl/initMaster.go --- old/kubic-control-0.10.0/pkg/kubicctl/initMaster.go 2020-07-02 14:27:01.908850854 +0200 +++ new/kubic-control-0.10.1/pkg/kubicctl/initMaster.go 2020-07-20 17:10:34.044444260 +0200 @@ -28,6 +28,7 @@ var ( podNetwork = "weave" adv_addr = "" + apiserver_cert_extra_sans = "" multiMaster = "" kubernetesVersion = "" stage = "" @@ -46,6 +47,7 @@ subCmd.PersistentFlags().StringVar(&multiMaster, "multi-master", multiMaster, "Setup multimaster cluster, argument needs to be the DNS name of the load balancer") subCmd.PersistentFlags().StringVar(&podNetwork, "pod-network", podNetwork, "pod network, valid values are 'cilium', 'flannel' or 'weave'") subCmd.PersistentFlags().StringVar(&adv_addr, "adv-addr", adv_addr, "IP address the API Server will advertise it's listening on") + subCmd.PersistentFlags().StringVar(&apiserver_cert_extra_sans, "apiserver_cert_extra_sans", apiserver_cert_extra_sans, "additional IPs to add to the APIserver certificate") subCmd.PersistentFlags().StringVar(&kubernetesVersion, "kubernetes-version", kubernetesVersion, "Kubernetes version of the control plane to deploy") subCmd.PersistentFlags().StringVar(&stage, "stage", stage, "Stage of development: 'official', 'devel'") subCmd.PersistentFlags().StringVar(&haproxy, "haproxy", haproxy, "Name of salt minion running haproxy as loadbalancer") @@ -69,7 +71,7 @@ defer cancel() fmt.Print ("Initializing kubernetes master can take several minutes, please be patient.\n") - stream, err := client.InitMaster(ctx, &pb.InitRequest{PodNetworking: podNetwork, AdvAddr: adv_addr, MultiMaster: multiMaster, KubernetesVersion: kubernetesVersion, Stage: stage, Haproxy: haproxy, FirstMaster: firstMaster}) + stream, err := client.InitMaster(ctx, &pb.InitRequest{PodNetworking: podNetwork, AdvAddr: adv_addr, ApiserverCertExtraSans: apiserver_cert_extra_sans, MultiMaster: multiMaster, KubernetesVersion: kubernetesVersion, Stage: stage, Haproxy: haproxy, FirstMaster: firstMaster}) if err != nil { fmt.Fprintf(os.Stderr, "Could not initialize: %v\n", err) return
