Move dqlite in its own systemd process (canonical#2542)

build-scripts/build-k8s-binaries.sh

@@ -35,12 +35,7 @@ git clone --depth 1 https://github.com/kubernetes/kubernetes $GOPATH/src/github.
   make clean
   for app in ${path_apps}
   do
-    if [ "$app" = "cmd/kubelite" ]
-    then
-      make WHAT="${app}" GOFLAGS=-tags=libsqlite3,dqlite CGO_CFLAGS="-I${SNAPCRAFT_STAGE}/usr/include/" CGO_LDFLAGS="-L${SNAPCRAFT_STAGE}/lib" KUBE_CGO_OVERRIDES=kubelite
-    else
-      make WHAT="${app}"
-    fi
+    make WHAT="${app}"
   done
 )
 for app in $apps; do

build-scripts/pre-patches/0001-Kubelite-integration.patch → build-scripts/patches/0000-Kubelite-integration.patch

@@ -1,4 +1,4 @@
-From 77bc6a29c8efcbafc57003e8e89208317b2bec78 Mon Sep 17 00:00:00 2001
+From 6583648f325f98bf5aed35b3a90ef9132bead309 Mon Sep 17 00:00:00 2001
 From: Konstantinos Tsakalozos <kos.tsakalozos@canonical.com>
 Date: Wed, 3 Mar 2021 18:19:37 +0200
 Subject: [PATCH] Kubelite integration
@@ -19,10 +19,10 @@ Subject: [PATCH] Kubelite integration
  create mode 100644 cmd/kubelite/kubelite.go
 
 diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
-index 776389f93e4..ca39da8a4c0 100644
+index 8c2d2a94d99..2351c86fa78 100644
 --- a/cmd/kube-apiserver/app/server.go
 +++ b/cmd/kube-apiserver/app/server.go
-@@ -102,7 +102,7 @@ func checkNonZeroInsecurePort(fs *pflag.FlagSet) error {
+@@ -91,7 +91,7 @@ func checkNonZeroInsecurePort(fs *pflag.FlagSet) error {
  }
 
  // NewAPIServerCommand creates a *cobra.Command object with default parameters
@@ -31,7 +31,7 @@ index 776389f93e4..ca39da8a4c0 100644
  	s := options.NewServerRunOptions()
  	cmd := &cobra.Command{
  		Use: "kube-apiserver",
-@@ -138,8 +138,11 @@ cluster's shared state through which all other components interact.`,
+@@ -127,8 +127,11 @@ cluster's shared state through which all other components interact.`,
  			if errs := completedOptions.Validate(); len(errs) != 0 {
  				return utilerrors.NewAggregate(errs)
  			}

build-scripts/patches/0001-Unix-socket-skip-validation-in-component-status.patch

@@ -0,0 +1,29 @@
+From dd1db952eab13912a55207c81a2ac267909677ac Mon Sep 17 00:00:00 2001
+From: Konstantinos Tsakalozos <kos.tsakalozos@canonical.com>
+Date: Tue, 24 Aug 2021 11:17:19 +0300
+Subject: [PATCH] Unix socket skip validation in component status
+
+---
+ pkg/registry/core/rest/storage_core.go | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go
+index 1f915c32d4b..0bb7f1a9bf9 100644
+--- a/pkg/registry/core/rest/storage_core.go
++++ b/pkg/registry/core/rest/storage_core.go
+@@ -350,6 +350,12 @@ func (s componentStatusStorage) serversToValidate() map[string]*componentstatus.
+ 			klog.Errorf("Failed to parse etcd url for validation: %v", err)
+ 			continue
+ 		}
++
++		if etcdUrl.Scheme == "unix" {
++			klog.Infof("Socket etcd endpoint detected. Will not validate")
++			continue
++		}
++
+ 		var port int
+ 		var addr string
+ 		if strings.Contains(etcdUrl.Host, ":") {
+-- 
+2.25.1
+

build-scripts/patches/0001-Kubelite-integration.patch → build-scripts/pre-patches/0000-Kubelite-integration.patch

@@ -1,4 +1,4 @@
-From 77bc6a29c8efcbafc57003e8e89208317b2bec78 Mon Sep 17 00:00:00 2001
+From 6583648f325f98bf5aed35b3a90ef9132bead309 Mon Sep 17 00:00:00 2001
 From: Konstantinos Tsakalozos <kos.tsakalozos@canonical.com>
 Date: Wed, 3 Mar 2021 18:19:37 +0200
 Subject: [PATCH] Kubelite integration
@@ -19,10 +19,10 @@ Subject: [PATCH] Kubelite integration
  create mode 100644 cmd/kubelite/kubelite.go
 
 diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
-index 776389f93e4..ca39da8a4c0 100644
+index 8c2d2a94d99..2351c86fa78 100644
 --- a/cmd/kube-apiserver/app/server.go
 +++ b/cmd/kube-apiserver/app/server.go
-@@ -102,7 +102,7 @@ func checkNonZeroInsecurePort(fs *pflag.FlagSet) error {
+@@ -91,7 +91,7 @@ func checkNonZeroInsecurePort(fs *pflag.FlagSet) error {
  }
 
  // NewAPIServerCommand creates a *cobra.Command object with default parameters
@@ -31,7 +31,7 @@ index 776389f93e4..ca39da8a4c0 100644
  	s := options.NewServerRunOptions()
  	cmd := &cobra.Command{
  		Use: "kube-apiserver",
-@@ -138,8 +138,11 @@ cluster's shared state through which all other components interact.`,
+@@ -127,8 +127,11 @@ cluster's shared state through which all other components interact.`,
  			if errs := completedOptions.Validate(); len(errs) != 0 {
  				return utilerrors.NewAggregate(errs)
  			}

build-scripts/pre-patches/0001-Unix-socket-skip-validation-in-component-status.patch

@@ -0,0 +1,29 @@
+From dd1db952eab13912a55207c81a2ac267909677ac Mon Sep 17 00:00:00 2001
+From: Konstantinos Tsakalozos <kos.tsakalozos@canonical.com>
+Date: Tue, 24 Aug 2021 11:17:19 +0300
+Subject: [PATCH] Unix socket skip validation in component status
+
+---
+ pkg/registry/core/rest/storage_core.go | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go
+index 1f915c32d4b..0bb7f1a9bf9 100644
+--- a/pkg/registry/core/rest/storage_core.go
++++ b/pkg/registry/core/rest/storage_core.go
+@@ -350,6 +350,12 @@ func (s componentStatusStorage) serversToValidate() map[string]*componentstatus.
+ 			klog.Errorf("Failed to parse etcd url for validation: %v", err)
+ 			continue
+ 		}
++
++		if etcdUrl.Scheme == "unix" {
++			klog.Infof("Socket etcd endpoint detected. Will not validate")
++			continue
++		}
++
+ 		var port int
+ 		var addr string
+ 		if strings.Contains(etcdUrl.Host, ":") {
+-- 
+2.25.1
+