This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 7310491 HDDS-5194. Provide kustomize descriptors for Ozone kubernetes
examples (#2221)
7310491 is described below
commit 7310491af7389cd391da09b2cfee7feb68f7261e
Author: Elek, Márton <[email protected]>
AuthorDate: Thu Feb 24 19:04:40 2022 +0100
HDDS-5194. Provide kustomize descriptors for Ozone kubernetes examples
(#2221)
---
hadoop-ozone/dev-support/checks/_lib.sh | 2 +-
.../k8s/definitions/ozone-csi/csi-controller.yaml | 2 +-
.../main/k8s/examples/getting-started/Flekszible | 2 +
.../examples/getting-started/config-configmap.yaml | 1 +
.../kustomization.yaml} | 30 +++++++-------
.../dist/src/main/k8s/examples/minikube/Flekszible | 2 +
.../k8s/examples/minikube/config-configmap.yaml | 1 +
.../Flekszible => minikube/kustomization.yaml} | 30 +++++++-------
.../src/main/k8s/examples/ozone-dev/Flekszible | 1 +
.../k8s/examples/ozone-dev/config-configmap.yaml | 1 +
.../Flekszible => ozone-dev/kustomization.yaml} | 46 +++++++++++-----------
.../dist/src/main/k8s/examples/ozone-ha/Flekszible | 3 ++
.../ozone-ha/{Flekszible => kustomization.yaml} | 26 ++++++------
.../dist/src/main/k8s/examples/ozone/Flekszible | 3 +-
.../main/k8s/examples/ozone/config-configmap.yaml | 1 +
.../Flekszible => ozone/kustomization.yaml} | 26 ++++++------
16 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/hadoop-ozone/dev-support/checks/_lib.sh
b/hadoop-ozone/dev-support/checks/_lib.sh
index 9342219..b81acf9 100644
--- a/hadoop-ozone/dev-support/checks/_lib.sh
+++ b/hadoop-ozone/dev-support/checks/_lib.sh
@@ -91,7 +91,7 @@ _install_flekszible() {
local os=$(uname -s)
local arch=$(uname -m)
- curl -LSs
https://github.com/elek/flekszible/releases/download/v1.8.1/flekszible_1.8.1_${os}_${arch}.tar.gz
| tar -xz -f - -C bin
+ curl -LSs
https://github.com/elek/flekszible/releases/download/v2.3.0/flekszible_2.3.0_${os}_${arch}.tar.gz
| tar -xz -f - -C bin
chmod +x bin/flekszible
}
diff --git
a/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-controller.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-controller.yaml
index 53d0e5c..511f48f 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-controller.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone-csi/csi-controller.yaml
@@ -50,4 +50,4 @@ spec:
- csi
volumes:
- name: socket-dir
- emptyDir:
+ emptyDir: {}
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/Flekszible
index 39fc53a..2ea9721 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/Flekszible
@@ -28,6 +28,8 @@ import:
transformations:
- type: Image
image: "@docker.image@"
+transformations:
+ - type: kustomize
header: |-
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
index f02fb56..5bd722d 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
@@ -27,6 +27,7 @@ data:
OZONE-SITE.XML_ozone.scm.client.address: scm-0.scm
OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
+ OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/kustomization.yaml
similarity index 71%
copy from hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
copy to
hadoop-ozone/dist/src/main/k8s/examples/getting-started/kustomization.yaml
index b800f899..3059b9c 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/kustomization.yaml
@@ -13,18 +13,18 @@
# 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.
-source:
- - path: ../../definitions
-import:
- - path: ozone
- transformations:
- - type: Image
- image: "@docker.image@"
- - type: ozone/persistence
- - path: ozone/freon
- destination: freon
- transformations:
- - type: Image
- image: "@docker.image@"
-transformations:
- - type: Namespace
+
+resources:
+- config-configmap.yaml
+- datanode-service.yaml
+- datanode-statefulset.yaml
+- om-service.yaml
+- om-statefulset.yaml
+- s3g-service.yaml
+- s3g-statefulset.yaml
+- scm-service.yaml
+- scm-statefulset.yaml
+- datanode-public-service.yaml
+- om-public-service.yaml
+- s3g-public-service.yaml
+- scm-public-service.yaml
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/minikube/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/Flekszible
index 3390db0..60b6bd2 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/Flekszible
@@ -36,6 +36,8 @@ import:
transformations:
- type: Image
image: "@docker.image@"
+transformations:
+ - type: kustomize
header: |-
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
index f02fb56..5bd722d 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
@@ -27,6 +27,7 @@ data:
OZONE-SITE.XML_ozone.scm.client.address: scm-0.scm
OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
+ OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/kustomization.yaml
similarity index 71%
copy from hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
copy to hadoop-ozone/dist/src/main/k8s/examples/minikube/kustomization.yaml
index b800f899..3059b9c 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/kustomization.yaml
@@ -13,18 +13,18 @@
# 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.
-source:
- - path: ../../definitions
-import:
- - path: ozone
- transformations:
- - type: Image
- image: "@docker.image@"
- - type: ozone/persistence
- - path: ozone/freon
- destination: freon
- transformations:
- - type: Image
- image: "@docker.image@"
-transformations:
- - type: Namespace
+
+resources:
+- config-configmap.yaml
+- datanode-service.yaml
+- datanode-statefulset.yaml
+- om-service.yaml
+- om-statefulset.yaml
+- s3g-service.yaml
+- s3g-statefulset.yaml
+- scm-service.yaml
+- scm-statefulset.yaml
+- datanode-public-service.yaml
+- om-public-service.yaml
+- s3g-public-service.yaml
+- scm-public-service.yaml
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/Flekszible
index 3d9bfcd..aad4836 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/Flekszible
@@ -45,3 +45,4 @@ import:
destination: pv-test
transformations:
- type: Namespace
+ - type: kustomize
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
index 5807630..4be594b 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
@@ -27,6 +27,7 @@ data:
OZONE-SITE.XML_ozone.scm.client.address: scm-0.scm
OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
+ OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/kustomization.yaml
similarity index 56%
copy from hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
copy to hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/kustomization.yaml
index ec6d745..cf0cbe1 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/kustomization.yaml
@@ -13,25 +13,27 @@
# 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.
-source:
- - path: ../../definitions
-import:
- - path: ozone
- transformations:
- - type: Image
- image: "@docker.image@"
- - type: ozone/persistence
- - type: ozone/csi
- - path: ozone/freon
- destination: freon
- transformations:
- - type: Image
- image: "@docker.image@"
- - path: pv-test
- destination: pv-test
- - path: ozone-csi
- destination: csi
- - path: test-webserver
- destination: pv-test
-transformations:
- - type: Namespace
+
+resources:
+- config-configmap.yaml
+- datanode-service.yaml
+- datanode-statefulset.yaml
+- om-service.yaml
+- om-statefulset.yaml
+- s3g-service.yaml
+- s3g-statefulset.yaml
+- scm-service.yaml
+- scm-statefulset.yaml
+- prometheusconf-configmap.yaml
+- prometheus-deployment.yaml
+- prometheus-clusterrole.yaml
+- prometheus-operator-clusterrolebinding.yaml
+- prometheus-operator-serviceaccount.yaml
+- prometheus-service.yaml
+- jaeger-service.yaml
+- jaeger-statefulset.yaml
+- datanode-public-service.yaml
+- om-public-service.yaml
+- s3g-public-service.yaml
+- scm-public-service.yaml
+- jaeger-public-service.yaml
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
index b800f899..445f255 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
@@ -26,5 +26,8 @@ import:
transformations:
- type: Image
image: "@docker.image@"
+ - type: kustomize
transformations:
- type: Namespace
+ - type: kustomize
+
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/kustomization.yaml
similarity index 71%
copy from hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
copy to hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/kustomization.yaml
index b800f899..6b3d553 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/kustomization.yaml
@@ -13,18 +13,14 @@
# 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.
-source:
- - path: ../../definitions
-import:
- - path: ozone
- transformations:
- - type: Image
- image: "@docker.image@"
- - type: ozone/persistence
- - path: ozone/freon
- destination: freon
- transformations:
- - type: Image
- image: "@docker.image@"
-transformations:
- - type: Namespace
+
+resources:
+- config-configmap.yaml
+- datanode-service.yaml
+- datanode-statefulset.yaml
+- om-service.yaml
+- om-statefulset.yaml
+- s3g-service.yaml
+- s3g-statefulset.yaml
+- scm-service.yaml
+- scm-statefulset.yaml
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
index ec6d745..5562aac 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
@@ -27,11 +27,10 @@ import:
transformations:
- type: Image
image: "@docker.image@"
- - path: pv-test
- destination: pv-test
- path: ozone-csi
destination: csi
- path: test-webserver
destination: pv-test
transformations:
- type: Namespace
+ - type: kustomize
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml
index 820c197..c7ac534 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml
@@ -27,6 +27,7 @@ data:
OZONE-SITE.XML_ozone.scm.client.address: scm-0.scm
OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
+ OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/kustomization.yaml
similarity index 71%
copy from hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
copy to hadoop-ozone/dist/src/main/k8s/examples/ozone/kustomization.yaml
index b800f899..6b3d553 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/kustomization.yaml
@@ -13,18 +13,14 @@
# 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.
-source:
- - path: ../../definitions
-import:
- - path: ozone
- transformations:
- - type: Image
- image: "@docker.image@"
- - type: ozone/persistence
- - path: ozone/freon
- destination: freon
- transformations:
- - type: Image
- image: "@docker.image@"
-transformations:
- - type: Namespace
+
+resources:
+- config-configmap.yaml
+- datanode-service.yaml
+- datanode-statefulset.yaml
+- om-service.yaml
+- om-statefulset.yaml
+- s3g-service.yaml
+- s3g-statefulset.yaml
+- scm-service.yaml
+- scm-statefulset.yaml
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
