This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch kustomize in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 6ab32ef16ffa52fccf7814d9823019058b0a0ef9 Author: Elek Márton <[email protected]> AuthorDate: Thu May 6 11:58:16 2021 +0200 generate kustomize compatibile descriptors --- 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 + .../examples/getting-started/kustomization.yaml | 14 +++++++++++++ .../dist/src/main/k8s/examples/minikube/Flekszible | 2 ++ .../k8s/examples/minikube/config-configmap.yaml | 1 + .../main/k8s/examples/minikube/kustomization.yaml | 14 +++++++++++++ .../src/main/k8s/examples/ozone-dev/Flekszible | 1 + .../k8s/examples/ozone-dev/config-configmap.yaml | 1 + .../main/k8s/examples/ozone-dev/kustomization.yaml | 23 ++++++++++++++++++++++ .../dist/src/main/k8s/examples/ozone-ha/Flekszible | 3 +++ .../main/k8s/examples/ozone-ha/kustomization.yaml | 10 ++++++++++ .../dist/src/main/k8s/examples/ozone/Flekszible | 3 +-- .../main/k8s/examples/ozone/config-configmap.yaml | 1 + .../src/main/k8s/examples/ozone/kustomization.yaml | 10 ++++++++++ 16 files changed, 86 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/dev-support/checks/_lib.sh b/hadoop-ozone/dev-support/checks/_lib.sh index 56b15da..7fed5d3 100644 --- a/hadoop-ozone/dev-support/checks/_lib.sh +++ b/hadoop-ozone/dev-support/checks/_lib.sh @@ -83,7 +83,7 @@ install_flekszible() { _install_flekszible() { mkdir bin - curl -LSs https://github.com/elek/flekszible/releases/download/v1.8.1/flekszible_1.8.1_Linux_x86_64.tar.gz | tar -xz -f - -C bin + curl -LSs https://github.com/elek/flekszible/releases/download/v2.3.0/flekszible_2.3.0_Linux_x86_64.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/getting-started/kustomization.yaml b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/kustomization.yaml new file mode 100644 index 0000000..c9c096e --- /dev/null +++ b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/kustomization.yaml @@ -0,0 +1,14 @@ +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/minikube/kustomization.yaml b/hadoop-ozone/dist/src/main/k8s/examples/minikube/kustomization.yaml new file mode 100644 index 0000000..c9c096e --- /dev/null +++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/kustomization.yaml @@ -0,0 +1,14 @@ +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-dev/kustomization.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/kustomization.yaml new file mode 100644 index 0000000..381ee23 --- /dev/null +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/kustomization.yaml @@ -0,0 +1,23 @@ +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 b800f89..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/kustomization.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/kustomization.yaml new file mode 100644 index 0000000..3db881b --- /dev/null +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/kustomization.yaml @@ -0,0 +1,10 @@ +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/kustomization.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone/kustomization.yaml new file mode 100644 index 0000000..3db881b --- /dev/null +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/kustomization.yaml @@ -0,0 +1,10 @@ +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]
