From dd91dd4bbb47eae413a932b6d6ca6e705c2bda8f Mon Sep 17 00:00:00 2001
From: Nianyu Shen <nianyu@spectrocloud.com>
Date: Tue, 19 Nov 2024 14:40:08 +0800
Subject: [PATCH 1/3] fix: copy cert in dockerfile (#313)

Signed-off-by: Nianyu Shen <xiaoyu9964@gmail.com>
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f8efb0..b76e681 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,19 +7,19 @@ ARG HTTP_PROXY
 ARG HTTPS_PROXY
 ARG NO_PROXY
 
-WORKDIR /certs
+RUN mkdir -p /certs
 COPY certs/ /certs/
 RUN if [ "${OS_DISTRIBUTION}" = "ubuntu" ]; then \
-    cp -f /certs/* /usr/local/share/ca-certificates/ && \
+    cp -a /certs/. /usr/local/share/ca-certificates/ && \
     update-ca-certificates; \
     fi 
 RUN if [ "${OS_DISTRIBUTION}" = "opensuse-leap" ]; then \
-    cp -f /certs/* /usr/share/pki/trust/anchors/ && \
+    cp -a /certs/. /usr/share/pki/trust/anchors/ && \
     update-ca-certificates; \
     fi
 
 RUN if [ "${OS_DISTRIBUTION}" = "rhel" ]; then \
-    cp -f /certs/* /etc/pki/ca-trust/source/anchors/ && \
+    cp -a /certs/. /etc/pki/ca-trust/source/anchors/ && \
     update-ca-trust; \
     fi
 RUN rm -rf /certs

From 21768b6da0b65e267023eb8bea0d330285df8b54 Mon Sep 17 00:00:00 2001
From: Medhakulam <30567613+Medhakulam@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:40:49 +0530
Subject: [PATCH 2/3] PAC-2269 4.5.b: Update K8s packs (Patches) (#314)

---
 k8s_version.json | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/k8s_version.json b/k8s_version.json
index db93b11..c7e2987 100644
--- a/k8s_version.json
+++ b/k8s_version.json
@@ -11,13 +11,16 @@
     "1.28.11",
     "1.28.13",
     "1.28.14",
+    "1.28.15",
     "1.29.0",
     "1.29.2",
     "1.29.6",
     "1.29.8",
     "1.29.9",
+    "1.29.10",
     "1.30.4",
-    "1.30.5"
+    "1.30.5",
+    "1.30.6"
   ],
   "kubeadm": [
     "1.26.4",
@@ -39,13 +42,16 @@
     "1.28.12",
     "1.28.13",
     "1.28.14",
+    "1.28.15",
     "1.29.0",
     "1.29.6",
     "1.29.7",
     "1.29.8",
     "1.29.9",
+    "1.29.10",
     "1.30.4",
-    "1.30.5"
+    "1.30.5",
+    "1.30.6"
   ],
   "rke2": [
     "1.26.4",
@@ -71,6 +77,7 @@
     "1.28.12",
     "1.28.13",
     "1.28.14",
+    "1.28.15",
     "1.29.3",
     "1.29.4",
     "1.29.5",
@@ -78,9 +85,11 @@
     "1.29.7",
     "1.29.8",
     "1.29.9",
+    "1.29.10",
     "1.30.3",
     "1.30.4",
-    "1.30.5"
+    "1.30.5",
+    "1.30.6"
   ],
   "kubeadm-fips": [
     "1.26.4",
@@ -97,14 +106,17 @@
     "1.28.12",
     "1.28.13",
     "1.28.14",
+    "1.28.15",
     "1.29.0",
     "1.29.5",
     "1.29.6",
     "1.29.7",
     "1.29.8",
     "1.29.9",
+    "1.29.10",
     "1.30.4",
-    "1.30.5"
+    "1.30.5",
+    "1.30.6"
   ],
   "nodeadm": [
     "1.29.0",

From 957e0620fc9fa70b36f7ce3b26170b36f4b1bbe2 Mon Sep 17 00:00:00 2001
From: Srinivas DM <srinivassena8@gmail.com>
Date: Tue, 26 Nov 2024 12:36:15 +0530
Subject: [PATCH 3/3] PAC-2269 added 1.31.1 for k3s and rke2 (#315)

---
 k8s_version.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/k8s_version.json b/k8s_version.json
index c7e2987..d1df524 100644
--- a/k8s_version.json
+++ b/k8s_version.json
@@ -20,7 +20,8 @@
     "1.29.10",
     "1.30.4",
     "1.30.5",
-    "1.30.6"
+    "1.30.6",
+    "1.31.1"
   ],
   "kubeadm": [
     "1.26.4",
@@ -89,7 +90,8 @@
     "1.30.3",
     "1.30.4",
     "1.30.5",
-    "1.30.6"
+    "1.30.6",
+    "1.31.1"
   ],
   "kubeadm-fips": [
     "1.26.4",