Merge remote-tracking branch 'origin/main' into k0s-1-29

Author: emosbaugh

.github/workflows/release-prod.yaml

@@ -428,14 +428,14 @@ jobs:
           LICENSE_ID: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
         run: |
           export APP_VERSION="appver-${{ github.ref_name }}"
-          curl -L "https://ec-e2e-replicated-app.testcluster.net/embedded/embedded-cluster-smoke-test-staging-app/ci/${APP_VERSION}" -H "Authorization: $LICENSE_ID" -o embedded-cluster-smoke-test-staging-app-ci.tgz
+          curl --retry 5 --retry-all-errors -fL -o embedded-cluster-smoke-test-staging-app-ci.tgz "https://ec-e2e-replicated-app.testcluster.net/embedded/embedded-cluster-smoke-test-staging-app/ci/${APP_VERSION}" -H "Authorization: $LICENSE_ID"
           tar -xzf embedded-cluster-smoke-test-staging-app-ci.tgz
           mv embedded-cluster-smoke-test-staging-app embedded-cluster
           mkdir -p output/bin
           mv embedded-cluster output/bin
           
           # download the embedded-cluster binary from the github release
-          curl -L "https://github.com/replicatedhq/embedded-cluster/releases/download/${{ github.ref_name }}/embedded-cluster-linux-amd64.tgz" -o embedded-cluster-github.tgz
+          curl --retry 5 --retry-all-errors -fL -o embedded-cluster-github.tgz "https://github.com/replicatedhq/embedded-cluster/releases/download/${{ github.ref_name }}/embedded-cluster-linux-amd64.tgz"
           tar -xzf embedded-cluster-github.tgz
           mv embedded-cluster output/bin/embedded-cluster-original
 

pkg/logging/logging.go renamed to cmd/installer/cli/logging.go

@@ -1,7 +1,4 @@
-// Package logging manages setup of common logging interfaces and settings. We set the log
-// level to all levels but we only show on stdout the info, error, and fatal levels. All
-// other error levels are written only to a log file.
-package logging
+package cli
 
 import (
 	"fmt"
@@ -13,6 +10,9 @@ import (
 	"github.com/fatih/color"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
 	"github.com/sirupsen/logrus"
+	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 // MaxLogFiles is the maximum number of log files we keep.
@@ -111,11 +111,22 @@ func SetupLogging() {
 	logpath := runtimeconfig.PathToLog(fname)
 	logfile, err := os.OpenFile(logpath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0400)
 	if err != nil {
-		logrus.Warnf("unable to setup logging: %v", err)
+		logrus.Warnf("Unable to setup logging: %v", err)
 		return
 	}
 	logrus.SetOutput(logfile)
 	logrus.AddHook(&StdoutLogger{})
 	logrus.Debugf("command line: %v", os.Args)
+
+	setupCtrlLogging(logfile)
+
 	trimLogDir()
 }
+
+// setupCtrlLogging sets up the logging for the controller-runtime package to the writer specified.
+func setupCtrlLogging(w io.Writer) {
+	k8slogger := ctrlzap.New(func(o *zap.Options) {
+		o.DestWriter = w
+	})
+	ctrllog.SetLogger(k8slogger)
+}

cmd/installer/cli/restore_test.go

@@ -11,12 +11,12 @@ import (
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	clitesting "github.com/replicatedhq/embedded-cluster/cmd/installer/cli/testing"
 	"github.com/replicatedhq/embedded-cluster/pkg/disasterrecovery"
+	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/kubectl/pkg/scheme"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -193,8 +193,7 @@ func Test_isReplicatedBackupRestorable(t *testing.T) {
 }
 
 func Test_waitForBackups(t *testing.T) {
-	scheme := scheme.Scheme
-	velerov1.AddToScheme(scheme)
+	scheme := kubeutils.Scheme
 
 	appendCommonAnnotations := func(annotations map[string]string) map[string]string {
 		annotations["kots.io/embedded-cluster-version"] = "v0.0.0"

cmd/installer/cli/testing/assets/release-restore-newdr/restore.yaml

@@ -17,7 +17,7 @@ spec:
       - init:
           initContainers:
           - name: restore-hook-init1
-            image: proxy.replicated.com/anonymous/nginx:1.24-alpine
+            image: 'repl{{ LocalImageName "proxy.replicated.com/anonymous/nginx:1.24-alpine" }}'
             command:
             - /bin/ash
             - -c

cmd/installer/main.go

@@ -6,16 +6,14 @@ import (
 	"path"
 
 	"github.com/mattn/go-isatty"
-
 	"github.com/replicatedhq/embedded-cluster/cmd/installer/cli"
-	"github.com/replicatedhq/embedded-cluster/pkg/logging"
 	"github.com/replicatedhq/embedded-cluster/pkg/prompts"
 )
 
 func main() {
 	ctx := context.Background()
 
-	logging.SetupLogging()
+	cli.SetupLogging()
 
 	prompts.SetTerminal(isatty.IsTerminal(os.Stdout.Fd()))
 

e2e/kots-release-install-failing-preflights/restore.yaml

@@ -20,7 +20,7 @@ spec:
       - init:
           initContainers:
           - name: restore-hook-init1
-            image: proxy.replicated.com/anonymous/nginx:1.24-alpine
+            image: 'repl{{ LocalImageName "proxy.replicated.com/anonymous/nginx:1.24-alpine" }}'
             command:
             - /bin/ash
             - -c

e2e/kots-release-install-warning-preflights/restore.yaml

@@ -20,7 +20,7 @@ spec:
       - init:
           initContainers:
           - name: restore-hook-init1
-            image: proxy.replicated.com/anonymous/nginx:1.24-alpine
+            image: 'repl{{ LocalImageName "proxy.replicated.com/anonymous/nginx:1.24-alpine" }}'
             command:
             - /bin/ash
             - -c

e2e/kots-release-install/restore.yaml

@@ -20,7 +20,7 @@ spec:
       - init:
           initContainers:
           - name: restore-hook-init1
-            image: proxy.replicated.com/anonymous/nginx:1.24-alpine
+            image: 'repl{{ LocalImageName "proxy.replicated.com/anonymous/nginx:1.24-alpine" }}'
             command:
             - /bin/ash
             - -c

e2e/kots-release-unsupported-overrides/restore.yaml

@@ -20,7 +20,7 @@ spec:
       - init:
           initContainers:
           - name: restore-hook-init1
-            image: proxy.replicated.com/anonymous/nginx:1.24-alpine
+            image: 'repl{{ LocalImageName "proxy.replicated.com/anonymous/nginx:1.24-alpine" }}'
             command:
             - /bin/ash
             - -c

e2e/kots-release-upgrade/restore.yaml

@@ -20,7 +20,7 @@ spec:
       - init:
           initContainers:
           - name: restore-hook-init1
-            image: proxy.replicated.com/anonymous/nginx:1.24-alpine
+            image: 'repl{{ LocalImageName "proxy.replicated.com/anonymous/nginx:1.24-alpine" }}'
             command:
             - /bin/ash
             - -c