Merge remote-tracking branch 'origin/master' into release-3.1

kubesphere · Aug 15, 2024 · 8347277 · 8347277
2 parents 09effbe + 4c2c755
commit 8347277
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/cmd/kk/pkg/images/tasks.go b/cmd/kk/pkg/images/tasks.go
@@ -380,8 +380,8 @@ func (p *PushManifest) Execute(_ connector.Runtime) error {
 
 	auths := registry.DockerRegistryAuthEntries(p.KubeConf.Cluster.Registry.Auths)
 	auth := new(registry.DockerRegistryEntry)
-	if _, ok := auths[p.KubeConf.Cluster.Registry.PrivateRegistry]; ok {
-		auth = auths[p.KubeConf.Cluster.Registry.PrivateRegistry]
+	if _, ok := auths[p.KubeConf.Cluster.Registry.GetHost()]; ok {
+		auth = auths[p.KubeConf.Cluster.Registry.GetHost()]
 	}
 
 	for imageName, platforms := range list {

diff --git a/docs/kubernetes-versions.md b/docs/kubernetes-versions.md
@@ -152,3 +152,5 @@
 | v1.30.1 | :white_check_mark: |
 | v1.30.2 | :white_check_mark: |
 | v1.30.3 | :white_check_mark: |
+| v1.30.4 | :white_check_mark: |
+| v1.31.0 | :white_check_mark: |
diff --git a/version/components.json b/version/components.json
@@ -151,7 +151,9 @@
             "v1.30.0": "29f4232c50e6524abba3443ff3b9948d386964d79eb8dfefb409e1f8a8434c14",
             "v1.30.1": "651faa3bbbfb368ed00460e4d11732614310b690b767c51810a7b638cc0961a2",
             "v1.30.2": "672b0cae2accce5eac10a1fe4ea6b166e5b518c79ccf71a2fbe7b53c2ca74062",
-            "v1.30.3": "bb78c2a27027278ee644d523f583ed7fdba48b4fbf31e3cfb0e309b6457dda69"
+            "v1.30.3": "bb78c2a27027278ee644d523f583ed7fdba48b4fbf31e3cfb0e309b6457dda69",
+            "v1.30.4": "6c6053fb8b31030ef7fffe146eb29489f7bf53d7a5ca10e0b10c907bf4b7e281",
+            "v1.31.0": "cf3b1a44b11ab226e40610e63d99fae7588a82940bb77da471a6dec624c819c2"
         },
         "arm64": {
             "v1.19.0": "db1c432646e6e6484989b6f7191f3610996ac593409f12574290bfc008ea11f5",
@@ -304,7 +306,9 @@
             "v1.30.0": "c36afd28921303e6db8e58274de16c60a80a1e75030fc3c4e9c4ed6249b6b696",
             "v1.30.1": "bda423cb4b9d056f99a2ef116bdf227fadbc1c3309fa3d76da571427a7f41478",
             "v1.30.2": "7268762b7afd44bf07619985dd52c376b63e47d73b8f9a3b08cc49624a8fbd55",
-            "v1.30.3": "6590f2447c87346aac29e2ab42fe4f29873f9bf154ee878f00da4c81bfdb8ea2"
+            "v1.30.3": "6590f2447c87346aac29e2ab42fe4f29873f9bf154ee878f00da4c81bfdb8ea2",
+            "v1.30.4": "609afad8590afb39b500cc5175c64b17690f7bf0b0eebcf1d347656d262e5c8c",
+            "v1.31.0": "dbeb84862d844d58f67ad6be64021681a314cda162a04e6047f376f2a9ad0226"
         }
     },
     "kubelet": {
@@ -459,7 +463,9 @@
             "v1.30.0": "32a32ec3d7e7f8b2648c9dd503ce9ef63b4af1d1677f5b5aed7846fb02d66f18",
             "v1.30.1": "87bd6e5de9c0769c605da5fedb77a35c8b764e3bda1632447883c935dcf219d3",
             "v1.30.2": "6923abe67ef069afca61c71c585023840426e802b198298055af3a82e11a4e52",
-            "v1.30.3": "9a37ddd5ea026639b7d85e98fa742e392df7aa5ec917bed0711a451613de3c1c"
+            "v1.30.3": "9a37ddd5ea026639b7d85e98fa742e392df7aa5ec917bed0711a451613de3c1c",
+            "v1.30.4": "0c02c0f997b3e9769eae7ca051856054411fca947b3d5409d991ce1964dd0e69",
+            "v1.31.0": "39e7f1c61c8389ea7680690f8bd5dd733672fa16875ae598df0fd8c205df57a9"
         },
         "arm64": {
             "v1.19.0": "d8fa5a9739ecc387dfcc55afa91ac6f4b0ccd01f1423c423dbd312d787bbb6bf",
@@ -612,7 +618,9 @@
             "v1.30.0": "fa887647422d34f3c7cc5b30fefcf97084d2c3277eff237c5808685ba8e4b15a",
             "v1.30.1": "c45049b829af876588ec1a30def3884ce77c2c175cd77485d49c78d2064a38fb",
             "v1.30.2": "72ceb082311b42032827a936f80cd2437b8eee03053d05dbe36ba48585febfb8",
-            "v1.30.3": "41d1926cd7b9c7c250c45f11c8fa9d1946cae98aec2eefc61a2cb4933612bcce"
+            "v1.30.3": "41d1926cd7b9c7c250c45f11c8fa9d1946cae98aec2eefc61a2cb4933612bcce",
+            "v1.30.4": "d3df7a4acff9aba5518930b9c417e8e0ca8cf5e105b7fee6504891fa8f3e962a",
+            "v1.31.0": "b310da449a9d2f8b928cab5ca12a6772617ba421023894e061ca2647e6d9f1c3"
         }
     },
     "kubectl": {
@@ -767,7 +775,9 @@
             "v1.30.0": "7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5",
             "v1.30.1": "5b86f0b06e1a5ba6f8f00e2b01e8ed39407729c4990aeda961f83a586f975e8a",
             "v1.30.2": "c6e9c45ce3f82c90663e3c30db3b27c167e8b19d83ed4048b61c1013f6a7c66e",
-            "v1.30.3": "abd83816bd236b266c3643e6c852b446f068fe260f3296af1a25b550854ec7e5"
+            "v1.30.3": "abd83816bd236b266c3643e6c852b446f068fe260f3296af1a25b550854ec7e5",
+            "v1.30.4": "2ffd023712bbc1a9390dbd8c0c15201c165a69d394787ef03eda3eccb4b9ac06",
+            "v1.31.0": "7c27adc64a84d1c0cc3dcf7bf4b6e916cc00f3f576a2dbac51b318d926032437"
         },
         "arm64": {
             "v1.19.0": "d4adf1b6b97252025cb2f7febf55daa3f42dc305822e3da133f77fd33071ec2f",
@@ -920,7 +930,9 @@
             "v1.30.0": "669af0cf520757298ea60a8b6eb6b719ba443a9c7d35f36d3fb2fd7513e8c7d2",
             "v1.30.1": "d90446719b815e3abfe7b2c46ddf8b3fda17599f03ab370d6e47b1580c0e869e",
             "v1.30.2": "56becf07105fbacd2b70f87f3f696cfbed226cb48d6d89ed7f65ba4acae3f2f8",
-            "v1.30.3": "c6f9568f930b16101089f1036677bb15a3185e9ed9b8dbce2f518fb5a52b6787"
+            "v1.30.3": "c6f9568f930b16101089f1036677bb15a3185e9ed9b8dbce2f518fb5a52b6787",
+            "v1.30.4": "1d8b4e6443c7df8e92a065d88d146142a202fea5ec694135b83d9668529ea3b1",
+            "v1.31.0": "f42832db7d77897514639c6df38214a6d8ae1262ee34943364ec1ffaee6c009c"
         }
     },
     "etcd": {