From b122f4e367c2af3ff3de03a845028fbd10b84323 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 4 Dec 2025 14:15:49 +0800 Subject: [PATCH] HDDS-14051 --- hadoop-hdds/docs/content/start/Kubernetes.md | 2 ++ hadoop-ozone/dev-support/checks/install/k3s.sh | 2 +- hadoop-ozone/dist/src/main/k8s/README.md | 2 ++ .../dist/src/main/k8s/definitions/ozone-csi/csi-crd.yaml | 2 +- hadoop-ozone/dist/src/main/k8s/definitions/prometheus/role.yaml | 2 +- .../dist/src/main/k8s/definitions/prometheus/rolebinding.yaml | 2 +- .../ozone-dev/csi/org.apache.hadoop.ozone-csidriver.yaml | 2 +- .../src/main/k8s/examples/ozone-dev/prometheus-clusterrole.yaml | 2 +- .../ozone-dev/prometheus-operator-clusterrolebinding.yaml | 2 +- .../examples/ozone/csi/org.apache.hadoop.ozone-csidriver.yaml | 2 +- 10 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hadoop-hdds/docs/content/start/Kubernetes.md b/hadoop-hdds/docs/content/start/Kubernetes.md index 6ecabb70a057..738c1d2f8109 100644 --- a/hadoop-hdds/docs/content/start/Kubernetes.md +++ b/hadoop-hdds/docs/content/start/Kubernetes.md @@ -25,6 +25,8 @@ weight: 22 * kubectl {{< /requirements >}} +**Note:** The Kubernetes examples and scripts in this project have been tested with Kubernetes 1.34.2 (k3s v1.34.2+k3s1). + As the _apache/ozone_ docker images are available from the dockerhub the deployment process is very similar to Minikube deployment. The only big difference is that we have dedicated set of k8s files for hosted clusters (for example we can use one datanode per host) Deploy to kubernetes diff --git a/hadoop-ozone/dev-support/checks/install/k3s.sh b/hadoop-ozone/dev-support/checks/install/k3s.sh index 2cd59874267c..9a7e8e54a1e5 100644 --- a/hadoop-ozone/dev-support/checks/install/k3s.sh +++ b/hadoop-ozone/dev-support/checks/install/k3s.sh @@ -17,7 +17,7 @@ # This script installs K3S. # Requires _install_tool from _lib.sh. Use `source` for both scripts, because it modifies $PATH. -: ${K3S_VERSION:="v1.21.2+k3s1"} +: ${K3S_VERSION:="v1.34.2+k3s1"} : ${KUBECONFIG:=/etc/rancher/k3s/k3s.yaml} _install_k3s() { diff --git a/hadoop-ozone/dist/src/main/k8s/README.md b/hadoop-ozone/dist/src/main/k8s/README.md index 44e5f97aa385..4d05c5e3fee8 100644 --- a/hadoop-ozone/dist/src/main/k8s/README.md +++ b/hadoop-ozone/dist/src/main/k8s/README.md @@ -15,6 +15,8 @@ Ozone on Kubernetes === +**Note:** The Kubernetes examples and scripts in this project have been tested with Kubernetes 1.34.2 (k3s v1.34.2+k3s1). + ## Connecting IDE to Ozone on Kubernetes ### Setup Ozone and Kubernetes diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-crd.yaml b/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-crd.yaml index f0ca37c30aa7..fa5e296b1784 100644 --- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-crd.yaml +++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-crd.yaml @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: name: org.apache.hadoop.ozone diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/role.yaml b/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/role.yaml index 194e9f4a2be0..438f8f7873aa 100644 --- a/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/role.yaml +++ b/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/role.yaml @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: prometheus diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/rolebinding.yaml b/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/rolebinding.yaml index ef5105da4e1f..9234629f598d 100644 --- a/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/rolebinding.yaml +++ b/hadoop-ozone/dist/src/main/k8s/definitions/prometheus/rolebinding.yaml @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: prometheus-operator diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/org.apache.hadoop.ozone-csidriver.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/org.apache.hadoop.ozone-csidriver.yaml index e657c50f7583..aa578e95f84e 100644 --- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/org.apache.hadoop.ozone-csidriver.yaml +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/org.apache.hadoop.ozone-csidriver.yaml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: name: org.apache.hadoop.ozone diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-clusterrole.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-clusterrole.yaml index bf62be615b7b..2fe727f6832a 100644 --- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-clusterrole.yaml +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-clusterrole.yaml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: prometheus-default diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-operator-clusterrolebinding.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-operator-clusterrolebinding.yaml index 13ac066aba9f..a1c2d9332948 100644 --- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-operator-clusterrolebinding.yaml +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/prometheus-operator-clusterrolebinding.yaml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: prometheus-operator-default diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/org.apache.hadoop.ozone-csidriver.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/org.apache.hadoop.ozone-csidriver.yaml index e657c50f7583..aa578e95f84e 100644 --- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/org.apache.hadoop.ozone-csidriver.yaml +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/org.apache.hadoop.ozone-csidriver.yaml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: name: org.apache.hadoop.ozone