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

sgalsaleh · sgalsaleh · commit db6955e67af6 · 2024-08-01T19:53:50.000Z
diff --git a/cmd/buildtools/k0s.go b/cmd/buildtools/k0s.go
@@ -21,7 +21,6 @@ var k0sImageComponents = map[string]string{
 	"registry.k8s.io/metrics-server/metrics-server": "metrics-server",
 	"quay.io/k0sproject/kube-proxy":                 "kube-proxy",
 	"quay.io/k0sproject/envoy-distroless":           "envoy-distroless",
-	"registry.k8s.io/pause":                         "pause",
 }
 
 var k0sComponents = map[string]addonComponent{
@@ -60,14 +59,6 @@ var k0sComponents = map[string]addonComponent{
 			return fmt.Sprintf("envoy-%d.%d", opts.upstreamVersion.Major(), opts.upstreamVersion.Minor())
 		},
 	},
-	"pause": {
-		getWolfiPackageName: func(opts addonComponentOptions) string {
-			return fmt.Sprintf("kubernetes-pause-%d.%d", opts.upstreamVersion.Major(), opts.upstreamVersion.Minor())
-		},
-		getWolfiPackageVersionComparison: func(opts addonComponentOptions) string {
-			return latestPatchComparison(opts.k0sVersion) // pause package version follows the k8s version
-		},
-	},
 }
 
 var updateK0sImagesCommand = &cli.Command{
diff --git a/deploy/images/pause/apko.tmpl.yaml b/deploy/images/pause/apko.tmpl.yaml
diff --git a/pkg/config/images.go b/pkg/config/images.go
@@ -71,8 +71,7 @@ func overrideK0sImages(cfg *k0sv1beta1.ClusterConfig) {
 	cfg.Spec.Images.KubeProxy.Image = helpers.AddonImageFromComponentName("kube-proxy")
 	cfg.Spec.Images.KubeProxy.Version = Metadata.Images["kube-proxy"]
 
-	cfg.Spec.Images.Pause.Image = helpers.AddonImageFromComponentName("pause")
-	cfg.Spec.Images.Pause.Version = Metadata.Images["pause"]
+	cfg.Spec.Images.Pause.Image = fmt.Sprintf("proxy.replicated.com/anonymous/%s", cfg.Spec.Images.Pause.Image)
 
 	// TODO (salah): remove the following and uncomment when upstream PR for digest support is released: https://github.com/k0sproject/k0s/pull/4792
 	if cfg.Spec.Network != nil &&
diff --git a/pkg/config/images_test.go b/pkg/config/images_test.go
@@ -39,6 +39,7 @@ func TestListK0sImages(t *testing.T) {
 	if len(filtered) == 0 {
 		t.Errorf("ListK0sImages() = %v, want not empty", filtered)
 	}
+	var foundPause bool
 	var foundEnvoyProxy bool
 	for _, image := range filtered {
 		if strings.Contains(image, "kube-router") {
@@ -51,7 +52,10 @@ func TestListK0sImages(t *testing.T) {
 			t.Errorf("ListK0sImages() = %v, want not to contain apiserver-network-proxy-agent", filtered)
 		}
 		if strings.Contains(image, constant.KubePauseContainerImage) {
-			t.Errorf("ListK0sImages() = %v, want the ec pause image", filtered)
+			foundPause = true
+			if !strings.HasPrefix(image, "proxy.replicated.com/anonymous/") {
+				t.Errorf("ListK0sImages() = %v, want pause to be proxied", filtered)
+			}
 		}
 		if strings.Contains(image, "envoy-distroless") {
 			foundEnvoyProxy = true
@@ -60,6 +64,9 @@ func TestListK0sImages(t *testing.T) {
 			}
 		}
 	}
+	if !foundPause {
+		t.Errorf("ListK0sImages() = %v, want to contain pause", filtered)
+	}
 	if !foundEnvoyProxy {
 		t.Errorf("ListK0sImages() = %v, want to contain envoy-distroless", filtered)
 	}
diff --git a/pkg/preflights/host-preflight.yaml b/pkg/preflights/host-preflight.yaml
@@ -49,15 +49,15 @@ spec:
     - hostOS: {}
   analyzers:
     - cpu:
-        checkName: 'Number of CPU cores'
+        checkName: CPU
         outcomes:
           - fail:
               when: 'count < 2'
               message: At least 2 CPU cores are required
           - pass:
               message: At least 2 CPU cores are present
     - memory:
-        checkName: Amount of Memory
+        checkName: Memory
         outcomes:
           - fail:
               when: '< 2G'
@@ -110,11 +110,12 @@ spec:
         outcomes:
           - fail:
               when: 'false'
-              message: 'No default route found. A default route is required.'
+              message: No default route found. A default route is required.
           - pass:
               when: 'true'
-              message: 'Host has a default route'
+              message: Host has a default route
     - ipv4Interfaces:
+        checkName: IPv4 Interface
         outcomes:
           - fail:
               when: 'count == 0'
@@ -127,28 +128,28 @@ spec:
         outcomes:
           - fail:
               when: 'ntp == unsynchronized+inactive'
-              message: 'System clock is not synchronized'
+              message: System clock is not synchronized
           - fail:
               when: 'ntp == unsynchronized+active'
               message: System clock is not yet synchronized
           - pass:
               when: 'ntp == synchronized+active'
-              message: 'System clock is synchronized'
+              message: System clock is synchronized
     - jsonCompare:
-        checkName: Check if either cgroup v1 or v2 is enabled
+        checkName: Cgroups
         fileName: host-collectors/system/cgroups.json
         path: 'cgroup-enabled'
         value: |
           true
         outcomes:
           - fail:
               when: 'false'
-              message: 'Neither cgroup v1 nor v2 is enabled'
+              message: Neither cgroup v1 nor v2 is enabled
           - pass:
               when: 'true'
-              message: 'One of cgroup v1 or v2 is enabled'
+              message: One of cgroup v1 or v2 is enabled
     - jsonCompare:
-        checkName: Check if cpu cgroup controller is enabled
+        checkName: "'cpu' Cgroup Controller"
         fileName: host-collectors/system/cgroups.json
         jsonPath: "{$.allControllers[?(@ == 'cpu')]}"
         value: |
@@ -161,7 +162,7 @@ spec:
               when: 'true'
               message: "'cpu' cgroup controller is enabled"
     - jsonCompare:
-        checkName: Check if cpuacct cgroup controller is enabled
+        checkName: "'cpuacct' Cgroup Controller"
         fileName: host-collectors/system/cgroups.json
         jsonPath: "{$.allControllers[?(@ == 'cpuacct')]}"
         value: |
@@ -174,7 +175,7 @@ spec:
               when: 'true'
               message: "'cpuacct' cgroup controller is enabled"
     - jsonCompare:
-        checkName: Check if cpuset cgroup controller is enabled
+        checkName: "'cpuset' Cgroup Controller"
         fileName: host-collectors/system/cgroups.json
         jsonPath: "{$.allControllers[?(@ == 'cpuset')]}"
         value: |
@@ -187,7 +188,7 @@ spec:
               when: 'true'
               message: "'cpuset' cgroup controller is enabled"
     - jsonCompare:
-        checkName: Check if memory cgroup controller is enabled
+        checkName: "'memory' Cgroup Controller"
         fileName: host-collectors/system/cgroups.json
         jsonPath: "{$.allControllers[?(@ == 'memory')]}"
         value: |
@@ -200,7 +201,7 @@ spec:
               when: 'true'
               message: "'memory' cgroup controller is enabled"
     - jsonCompare:
-        checkName: Check if devices cgroup controller is enabled
+        checkName: "'devices' Cgroup Controller"
         fileName: host-collectors/system/cgroups.json
         jsonPath: "{$.allControllers[?(@ == 'devices')]}"
         value: |
@@ -213,7 +214,7 @@ spec:
               when: 'true'
               message: "'devices' cgroup controller is enabled"
     - jsonCompare:
-        checkName: Check if freezer cgroup controller is enabled
+        checkName: "'freezer' Cgroup Controller"
         fileName: host-collectors/system/cgroups.json
         jsonPath: "{$.allControllers[?(@ == 'freezer')]}"
         value: |
@@ -226,7 +227,7 @@ spec:
               when: 'true'
               message: "'freezer' cgroup controller is enabled"
     - jsonCompare:
-        checkName: Check if pids cgroup controller is enabled
+        checkName: "'pids' Cgroup Controller"
         fileName: host-collectors/system/cgroups.json
         jsonPath: "{$.allControllers[?(@ == 'pids')]}"
         value: |
@@ -239,18 +240,18 @@ spec:
               when: 'true'
               message: "'pids' cgroup controller is enabled"
     - textAnalyze:
-        checkName: Check if /proc filesystem is mounted
+        checkName: /proc Filesystem
         fileName: host-collectors/run-host/check-proc-filesystem.txt
         regex: 'proc'
         outcomes:
           - pass:
               when: "true"
-              message: "/proc filesystem is mounted"
+              message: /proc filesystem is mounted
           - fail:
               when: "false"
-              message: "/proc filesystem is not mounted"
+              message: /proc filesystem is not mounted
     - textAnalyze:
-        checkName: Check if 'modprobe' command exists in PATH
+        checkName: "'modprobe' Command"
         fileName: host-collectors/run-host/check-modprobe.txt
         regex: '/usr/sbin/modprobe'
         outcomes:
@@ -261,7 +262,7 @@ spec:
               when: "false"
               message: "'modprobe' command does not exist in PATH"
     - textAnalyze:
-        checkName: Check if 'mount' command exists in PATH
+        checkName: "'mount' Command"
         fileName: host-collectors/run-host/check-mount.txt
         regex: '/usr/bin/mount'
         outcomes:
@@ -272,7 +273,7 @@ spec:
               when: "false"
               message: "'mount' command does not exist in PATH"
     - textAnalyze:
-        checkName: Check if 'umount' command exists in PATH
+        checkName: "'umount' Command"
         fileName: host-collectors/run-host/check-umount.txt
         regex: '/usr/bin/umount'
         outcomes:
@@ -283,10 +284,10 @@ spec:
               when: "false"
               message: "'umount' command does not exist in PATH"
     - hostOS:
-        checkName: Check minimum kernel version
+        checkName: Kernel Version
         outcomes:
           - pass:
               when: "kernelVersion >= 3.10"
-              message: "Minimum kernel version of 3.10 has been met"
+              message: Kernel meets minimum version version of 3.10
           - fail:
-              message: "Minimum kernel version of 3.10 has not been met"
+              message: Kernel doesn't meet minimum version of 3.10

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ func TestListK0sImages(t *testing.T) {`
`39`	`39`	`if len(filtered) == 0 {`
`40`	`40`	`t.Errorf("ListK0sImages() = %v, want not empty", filtered)`
`41`	`41`	`}`
	`42`	`+ var foundPause bool`
`42`	`43`	`var foundEnvoyProxy bool`
`43`	`44`	`for _, image := range filtered {`
`44`	`45`	`if strings.Contains(image, "kube-router") {`
`@@ -51,7 +52,10 @@ func TestListK0sImages(t *testing.T) {`
`51`	`52`	`t.Errorf("ListK0sImages() = %v, want not to contain apiserver-network-proxy-agent", filtered)`
`52`	`53`	`}`
`53`	`54`	`if strings.Contains(image, constant.KubePauseContainerImage) {`
`54`		`- t.Errorf("ListK0sImages() = %v, want the ec pause image", filtered)`
	`55`	`+ foundPause = true`
	`56`	`+ if !strings.HasPrefix(image, "proxy.replicated.com/anonymous/") {`
	`57`	`+ t.Errorf("ListK0sImages() = %v, want pause to be proxied", filtered)`
	`58`	`+ }`
`55`	`59`	`}`
`56`	`60`	`if strings.Contains(image, "envoy-distroless") {`
`57`	`61`	`foundEnvoyProxy = true`
`@@ -60,6 +64,9 @@ func TestListK0sImages(t *testing.T) {`
`60`	`64`	`}`
`61`	`65`	`}`
`62`	`66`	`}`
	`67`	`+ if !foundPause {`
	`68`	`+ t.Errorf("ListK0sImages() = %v, want to contain pause", filtered)`
	`69`	`+ }`
`63`	`70`	`if !foundEnvoyProxy {`
`64`	`71`	`t.Errorf("ListK0sImages() = %v, want to contain envoy-distroless", filtered)`
`65`	`72`	`}`