This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 90afb7b HDDS-1725. pv-test example to test csi is not working
90afb7b is described below
commit 90afb7bf8cef7ec6b6e456c87a1c86e406f5f461
Author: Márton Elek <e...@apache.org>
AuthorDate: Wed Jun 26 22:37:14 2019 +0200
HDDS-1725. pv-test example to test csi is not working
---
.../main/k8s/definitions/pv-test/flekszible.yaml | 2 +-
.../definitions/pv-test/nginx-conf-configmap.yaml | 37 -----------
.../pv-test/webserver-deployment.yaml} | 45 ++++++-------
.../pv-test/webserver-service.yaml} | 6 +-
.../pv-test/webserver-volume.yaml} | 2 +-
.../src/main/k8s/examples/ozone-csi/Flekszible | 26 --------
.../k8s/examples/ozone-csi/config-configmap.yaml | 37 -----------
.../k8s/examples/ozone-csi/datanode-daemonset.yaml | 60 ------------------
.../k8s/examples/ozone-csi/datanode-service.yaml | 28 ---------
.../examples/ozone-csi/datanode-statefulset.yaml | 66 -------------------
.../k8s/examples/ozone-csi/om-statefulset.yaml | 65 -------------------
.../ozone-csi/pv-test/nginx-conf-configmap.yaml | 38 -----------
.../main/k8s/examples/ozone-csi/s3g-service.yaml | 28 ---------
.../main/k8s/examples/ozone-csi/scm-service.yaml | 28 ---------
.../k8s/examples/ozone-csi/scm-statefulset.yaml | 73 ----------------------
.../src/main/k8s/examples/ozone-dev/Flekszible | 9 +++
.../k8s/examples/ozone-dev/config-configmap.yaml | 3 +
.../csi}/csi-node-daemonset.yaml | 0
.../csi}/csi-ozone-clusterrole.yaml | 0
.../csi}/csi-ozone-clusterrolebinding.yaml | 2 +-
.../csi}/csi-ozone-serviceaccount.yaml | 2 +-
.../csi}/csi-provisioner-deployment.yaml | 0
.../csi}/org.apache.hadoop.ozone-csidriver.yaml | 0
.../csi}/ozone-storageclass.yaml | 0
.../examples/ozone-dev/datanode-statefulset.yaml | 6 +-
.../k8s/examples/ozone-dev/om-statefulset.yaml | 6 +-
.../prometheus-operator-clusterrolebinding.yaml | 2 +-
.../ozone-csi-test-webserver-deployment.yaml} | 28 ++++-----
...-csi-test-webserver-persistentvolumeclaim.yaml} | 5 +-
.../pv-test/ozone-csi-test-webserver-service.yaml} | 9 +--
.../k8s/examples/ozone-dev/s3g-statefulset.yaml | 6 +-
.../k8s/examples/ozone-dev/scm-statefulset.yaml | 12 ++--
.../dist/src/main/k8s/examples/ozone/Flekszible | 25 +++-----
.../main/k8s/examples/ozone/config-configmap.yaml | 3 +
.../csi}/csi-node-daemonset.yaml | 0
.../csi}/csi-ozone-clusterrole.yaml | 0
.../csi}/csi-ozone-clusterrolebinding.yaml | 2 +-
.../csi/csi-ozone-serviceaccount.yaml} | 6 ++
.../csi}/csi-provisioner-deployment.yaml | 0
.../csi}/org.apache.hadoop.ozone-csidriver.yaml | 0
.../csi}/ozone-storageclass.yaml | 0
.../k8s/examples/ozone/datanode-statefulset.yaml | 6 +-
.../main/k8s/examples/ozone/om-statefulset.yaml | 6 +-
.../ozone-csi-test-webserver-deployment.yaml} | 39 ++++++------
...-csi-test-webserver-persistentvolumeclaim.yaml} | 2 +-
.../pv-test/ozone-csi-test-webserver-service.yaml} | 13 ++--
.../main/k8s/examples/ozone/s3g-statefulset.yaml | 6 +-
.../main/k8s/examples/ozone/scm-statefulset.yaml | 12 ++--
48 files changed, 139 insertions(+), 612 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/flekszible.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/flekszible.yaml
index bfe82ff..54203bd 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/flekszible.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/flekszible.yaml
@@ -13,4 +13,4 @@
# 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.
-description: Nginx example deployment with persistent volume claim.
+description: Simple python based webserver with persistent volume claim.
diff --git
a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-conf-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-conf-configmap.yaml
deleted file mode 100644
index 1fd8941..0000000
---
a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-conf-configmap.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: v1
-kind: ConfigMap
-metadata:
- name: nginx-conf
- labels: {}
- annotations: {}
-data:
- default.conf: |-
- server {
- listen 80;
- server_name localhost;
-
- location / {
- root /usr/share/nginx/html;
- index index.html index.htm;
- }
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
- }
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-deployment.yaml
similarity index 65%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-statefulset.yaml
rename to
hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-deployment.yaml
index 1718fed..d8e7578 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-statefulset.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-deployment.yaml
@@ -15,41 +15,36 @@
# limitations under the License.
apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
metadata:
- name: s3g
+ name: ozone-csi-test-webserver
labels:
- app.kubernetes.io/component: ozone
+ app: ozone-csi-test-webserver
+ annotations: {}
spec:
+ replicas: 1
selector:
matchLabels:
- app: ozone
- component: s3g
- serviceName: s3g
- replicas: 1
+ app: ozone-csi-test-webserver
template:
metadata:
labels:
- app: ozone
- component: s3g
+ app: ozone-csi-test-webserver
spec:
containers:
- - name: s3g
- image: '@docker.image@'
+ - name: web
+ image: python:3.7.3-alpine3.8
args:
- - ozone
- - s3g
- livenessProbe:
- httpGet:
- path: /
- port: 9878
- initialDelaySeconds: 30
+ - python
+ - -m
+ - http.server
+ - --directory
+ - /www
volumeMounts:
- - name: data
- mountPath: /data
- envFrom:
- - configMapRef:
- name: config
+ - mountPath: /www
+ name: webroot
volumes:
- - name: data
- emptyDir: {}
+ - name: webroot
+ persistentVolumeClaim:
+ claimName: ozone-csi-test-webserver
+ readOnly: false
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-service-service.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-service.yaml
similarity index 91%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-service-service.yaml
rename to
hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-service.yaml
index b31a510..6a53a43 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-service-service.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-service.yaml
@@ -17,13 +17,13 @@
apiVersion: v1
kind: Service
metadata:
- name: nginx-service
+ name: ozone-csi-test-webserver
labels: {}
annotations: {}
spec:
type: NodePort
ports:
- - port: 80
+ - port: 8000
name: web
selector:
- app: csi-s3-test-nginx
+ app: ozone-csi-test-webserver
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-storage-persistentvolumeclaim.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-volume.yaml
similarity index 96%
copy from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-storage-persistentvolumeclaim.yaml
copy to hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-volume.yaml
index 5968b92..4b1e44b 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-storage-persistentvolumeclaim.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/webserver-volume.yaml
@@ -17,7 +17,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
- name: nginx-storage
+ name: ozone-csi-test-webserver
labels: {}
annotations: {}
spec:
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
deleted file mode 100644
index 5a3b89a..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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-csi
- - path: ozone
- transformations:
- - type: ozone/csi
- - type: ozone/emptydir
- - path: pv-test
- destination: pv-test
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/config-configmap.yaml
deleted file mode 100644
index e554145..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/config-configmap.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: v1
-kind: ConfigMap
-metadata:
- name: config
-data:
- OZONE-SITE.XML_hdds.datanode.dir: /data/storage
- OZONE-SITE.XML_ozone.scm.datanode.id.dir: /data
- OZONE-SITE.XML_ozone.metadata.dirs: /data/metadata
- OZONE-SITE.XML_ozone.scm.block.client.address: scm-0.scm
- OZONE-SITE.XML_ozone.om.address: om-0.om
- OZONE-SITE.XML_ozone.scm.client.address: scm-0.scm
- OZONE-SITE.XML_ozone.scm.names: scm-0.scm
- OZONE-SITE.XML_ozone.enabled: "true"
- 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
- LOG4J.PROPERTIES_log4j.appender.stdout.layout.ConversionPattern:
'%d{yyyy-MM-dd
- HH:mm:ss} %-5p %c{1}:%L - %m%n'
- OZONE-SITE.XML_ozone.csi.s3g.address: http://s3g-0.s3g:9878
- OZONE-SITE.XML_ozone.csi.socket: /var/lib/csi/csi.sock
- OZONE-SITE.XML_ozone.csi.owner: hadoop
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-daemonset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-daemonset.yaml
deleted file mode 100644
index 67c8fc2..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-daemonset.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: apps/v1
-kind: DaemonSet
-metadata:
- name: datanode
- labels:
- app.kubernetes.io/component: ozone
-spec:
- selector:
- matchLabels:
- app: ozone
- component: datanode
- template:
- metadata:
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "9882"
- prometheus.io/path: /prom
- labels:
- app: ozone
- component: datanode
- spec:
- containers:
- - name: datanode
- image: '@docker.image@'
- args:
- - ozone
- - datanode
- ports:
- - containerPort: 9870
- name: rpc
- livenessProbe:
- tcpSocket:
- port: 9858
- initialDelaySeconds: 30
- volumeMounts:
- - name: data
- mountPath: /data
- envFrom:
- - configMapRef:
- name: config
- initContainers: []
- volumes:
- - name: data
- emptyDir: {}
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-service.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-service.yaml
deleted file mode 100644
index 929e7a2..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-service.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: v1
-kind: Service
-metadata:
- name: datanode
-spec:
- ports:
- - port: 9870
- name: rpc
- clusterIP: None
- selector:
- app: ozone
- component: datanode
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-statefulset.yaml
deleted file mode 100644
index 452e258..0000000
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-statefulset.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: apps/v1
-kind: StatefulSet
-metadata:
- name: datanode
- labels:
- app.kubernetes.io/component: ozone
-spec:
- selector:
- matchLabels:
- app: ozone
- component: datanode
- serviceName: datanode
- replicas: 3
- template:
- metadata:
- labels:
- app: ozone
- component: datanode
- annotations:
- prdatanodeetheus.io/scrape: "true"
- prdatanodeetheus.io/port: "9882"
- prdatanodeetheus.io/path: /prom
- spec:
- affinity:
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: component
- operator: In
- values:
- - datanode
- topologyKey: kubernetes.io/hostname
- securityContext:
- fsGroup: 1000
- containers:
- - name: datanode
- image: '@docker.image@'
- args:
- - ozone
- - datanode
- volumeMounts:
- - name: data
- mountPath: /data
- envFrom:
- - configMapRef:
- name: config
- volumes:
- - name: data
- emptyDir: {}
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-statefulset.yaml
deleted file mode 100644
index 172df34..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-statefulset.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: apps/v1
-kind: StatefulSet
-metadata:
- name: om
- labels:
- app.kubernetes.io/component: ozone
-spec:
- selector:
- matchLabels:
- app: ozone
- component: om
- serviceName: om
- replicas: 1
- template:
- metadata:
- labels:
- app: ozone
- component: om
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "9874"
- prometheus.io/path: /prom
- spec:
- securityContext:
- fsGroup: 1000
- containers:
- - name: om
- image: '@docker.image@'
- args:
- - ozone
- - om
- env:
- - name: WAITFOR
- value: scm-0.scm:9876
- - name: ENSURE_OM_INITIALIZED
- value: /data/metadata/om/current/VERSION
- livenessProbe:
- tcpSocket:
- port: 9862
- initialDelaySeconds: 30
- volumeMounts:
- - name: data
- mountPath: /data
- envFrom:
- - configMapRef:
- name: config
- volumes:
- - name: data
- emptyDir: {}
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-conf-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-conf-configmap.yaml
deleted file mode 100644
index 2f1813c..0000000
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-conf-configmap.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: v1
-kind: ConfigMap
-metadata:
- name: nginx-conf
- labels: {}
- annotations: {}
-data:
- default.conf: |-
- server {
- listen 80;
- server_name localhost;
-
- location / {
- root /usr/share/nginx/html;
- index index.html index.htm;
- }
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
- }
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-service.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-service.yaml
deleted file mode 100644
index dd1ca83..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-service.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: v1
-kind: Service
-metadata:
- name: s3g
-spec:
- ports:
- - port: 9878
- name: rest
- clusterIP: None
- selector:
- app: ozone
- component: s3g
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-service.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-service.yaml
deleted file mode 100644
index 0df15d6..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-service.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: v1
-kind: Service
-metadata:
- name: scm
-spec:
- ports:
- - port: 9876
- name: ui
- clusterIP: None
- selector:
- app: ozone
- component: scm
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-statefulset.yaml
deleted file mode 100644
index 7f1606d..0000000
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-statefulset.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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: apps/v1
-kind: StatefulSet
-metadata:
- name: scm
- labels:
- app.kubernetes.io/component: ozone
-spec:
- selector:
- matchLabels:
- app: ozone
- component: scm
- serviceName: scm
- replicas: 1
- template:
- metadata:
- labels:
- app: ozone
- component: scm
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "9876"
- prometheus.io/path: /prom
- spec:
- securityContext:
- fsGroup: 1000
- initContainers:
- - name: init
- image: '@docker.image@'
- args:
- - ozone
- - scm
- - --init
- volumeMounts:
- - name: data
- mountPath: /data
- envFrom:
- - configMapRef:
- name: config
- containers:
- - name: scm
- image: '@docker.image@'
- args:
- - ozone
- - scm
- livenessProbe:
- tcpSocket:
- port: 9861
- initialDelaySeconds: 30
- volumeMounts:
- - name: data
- mountPath: /data
- envFrom:
- - configMapRef:
- name: config
- volumes:
- - name: data
- emptyDir: {}
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 d28ecf5..96e8c62 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/Flekszible
@@ -25,6 +25,7 @@ import:
- type: ozone/tracing
- type: ozone/profiler
- type: ozone/emptydir
+ - type: ozone/csi
- path: prometheus
- path: jaeger
transformations:
@@ -35,3 +36,11 @@ import:
- type: Image
image: "@docker.image@"
- type: ozone/tracing
+ - path: pv-test
+ destination: pv-test
+ - path: ozone-csi
+ destination: csi
+ - path: pv-test
+ destination: pv-test
+transformations:
+ - type: Namespace
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 96d011c..43d11a4 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
@@ -35,3 +35,6 @@ data:
OZONE-SITE.XML_hdds.prometheus.endpoint.enabled: "true"
OZONE-SITE.XML_hdds.profiler.endpoint.enabled: "true"
ASYNC_PROFILER_HOME: /opt/profiler
+ OZONE-SITE.XML_ozone.csi.s3g.address: http://s3g-0.s3g:9878
+ OZONE-SITE.XML_ozone.csi.socket: /var/lib/csi/csi.sock
+ OZONE-SITE.XML_ozone.csi.owner: hadoop
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-node-daemonset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-node-daemonset.yaml
similarity index 100%
copy from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-node-daemonset.yaml
copy to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-node-daemonset.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrole.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-clusterrole.yaml
similarity index 100%
copy from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrole.yaml
copy to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-clusterrole.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrolebinding.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-clusterrolebinding.yaml
similarity index 97%
copy from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrolebinding.yaml
copy to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-clusterrolebinding.yaml
index 2f2537c..bb8bdf8 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrolebinding.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-clusterrolebinding.yaml
@@ -21,7 +21,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: csi-ozone
- namespace: default
+ namespace: weekly-test
roleRef:
kind: ClusterRole
name: csi-ozone
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-serviceaccount.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-serviceaccount.yaml
similarity index 97%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-serviceaccount.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-serviceaccount.yaml
index 628d2a1..41f7747 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-serviceaccount.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-ozone-serviceaccount.yaml
@@ -17,5 +17,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- namespace: default
+ namespace: weekly-test
name: csi-ozone
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-provisioner-deployment.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-provisioner-deployment.yaml
similarity index 100%
copy from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-provisioner-deployment.yaml
copy to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/csi-provisioner-deployment.yaml
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-dev/csi/org.apache.hadoop.ozone-csidriver.yaml
similarity index 100%
copy from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/org.apache.hadoop.ozone-csidriver.yaml
copy to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/org.apache.hadoop.ozone-csidriver.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/ozone-storageclass.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/ozone-storageclass.yaml
similarity index 100%
copy from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/ozone-storageclass.yaml
copy to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/csi/ozone-storageclass.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml
index b8e43e4..843aa94 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml
@@ -55,6 +55,9 @@ spec:
args:
- ozone
- datanode
+ envFrom:
+ - configMapRef:
+ name: config
env:
- name: JAEGER_SAMPLER_TYPE
value: probabilistic
@@ -65,9 +68,6 @@ spec:
volumeMounts:
- name: data
mountPath: /data
- envFrom:
- - configMapRef:
- name: config
volumes:
- name: data
emptyDir: {}
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml
index 8f57a38..36df22c 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml
@@ -60,12 +60,12 @@ spec:
tcpSocket:
port: 9862
initialDelaySeconds: 30
- volumeMounts:
- - name: data
- mountPath: /data
envFrom:
- configMapRef:
name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
volumes:
- name: data
emptyDir: {}
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 b0d8318..6ee6217 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
@@ -25,4 +25,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: prometheus-operator
- namespace: default
+ namespace: weekly-test
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-deployment.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-deployment.yaml
similarity index 75%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-deployment.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-deployment.yaml
index db6eb10..04edcec 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-deployment.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-deployment.yaml
@@ -17,34 +17,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: nginx
+ name: ozone-csi-test-webserver
labels:
- app: nginx
+ app: ozone-csi-test-webserver
annotations: {}
spec:
replicas: 1
selector:
matchLabels:
- app: nginx
+ app: ozone-csi-test-webserver
template:
metadata:
labels:
- app: nginx
- annotations: {}
+ app: ozone-csi-test-webserver
spec:
containers:
- - name: nginx
- image: nginx
+ - name: web
+ image: python:3.7.3-alpine3.8
+ args:
+ - python
+ - -m
+ - http.server
+ - --directory
+ - /www
volumeMounts:
- - mountPath: /var/lib/www/html
+ - mountPath: /www
name: webroot
- env: []
- envFrom: []
volumes:
- name: webroot
persistentVolumeClaim:
- claimName: nginx-storage
+ claimName: ozone-csi-test-webserver
readOnly: false
- - name: config
- configMap:
- name: nginx-conf
diff --git
a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-storage-persistentvolumeclaim.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-persistentvolumeclaim.yaml
similarity index 94%
rename from
hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-storage-persistentvolumeclaim.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-persistentvolumeclaim.yaml
index ec0d76b..4b1e44b 100644
---
a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-storage-persistentvolumeclaim.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-persistentvolumeclaim.yaml
@@ -13,15 +13,16 @@
# 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: v1
kind: PersistentVolumeClaim
metadata:
- name: nginx-storage
+ name: ozone-csi-test-webserver
labels: {}
annotations: {}
spec:
accessModes:
- - ReadWriteOnce
+ - ReadWriteOnce
resources:
requests:
storage: 1Gi
diff --git
a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-service-service.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-service.yaml
similarity index 90%
rename from
hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-service-service.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-service.yaml
index 3a338ba..6a53a43 100644
---
a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-service-service.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/pv-test/ozone-csi-test-webserver-service.yaml
@@ -13,16 +13,17 @@
# 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: v1
kind: Service
metadata:
- name: nginx-service
+ name: ozone-csi-test-webserver
labels: {}
annotations: {}
spec:
type: NodePort
ports:
- - port: 80
- name: web
+ - port: 8000
+ name: web
selector:
- app: csi-s3-test-nginx
+ app: ozone-csi-test-webserver
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml
index d6288cd..0feb368 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml
@@ -44,6 +44,9 @@ spec:
path: /
port: 9878
initialDelaySeconds: 30
+ envFrom:
+ - configMapRef:
+ name: config
env:
- name: JAEGER_SAMPLER_TYPE
value: probabilistic
@@ -54,9 +57,6 @@ spec:
volumeMounts:
- name: data
mountPath: /data
- envFrom:
- - configMapRef:
- name: config
volumes:
- name: data
emptyDir: {}
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml
index e9b5add..246f8c4 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml
@@ -46,12 +46,12 @@ spec:
- ozone
- scm
- --init
- volumeMounts:
- - name: data
- mountPath: /data
envFrom:
- configMapRef:
name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
containers:
- name: scm
image: '@docker.image@'
@@ -62,6 +62,9 @@ spec:
tcpSocket:
port: 9861
initialDelaySeconds: 30
+ envFrom:
+ - configMapRef:
+ name: config
env:
- name: JAEGER_SAMPLER_TYPE
value: probabilistic
@@ -72,9 +75,6 @@ spec:
volumeMounts:
- name: data
mountPath: /data
- envFrom:
- - configMapRef:
- name: config
volumes:
- name: data
emptyDir: {}
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
index 434b0b6..2fb527c 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/Flekszible
@@ -21,24 +21,17 @@ import:
- type: Image
image: "@docker.image@"
- type: ozone/persistence
+ - type: ozone/csi
- path: ozone/freon
destination: freon
transformations:
- type: Image
image: "@docker.image@"
-header: |-
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # 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.
+ - path: pv-test
+ destination: pv-test
+ - path: ozone-csi
+ destination: csi
+ - path: pv-test
+ destination: pv-test
+transformations:
+ - type: Namespace
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 94d16d2..e554145 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
@@ -32,3 +32,6 @@ data:
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
LOG4J.PROPERTIES_log4j.appender.stdout.layout.ConversionPattern:
'%d{yyyy-MM-dd
HH:mm:ss} %-5p %c{1}:%L - %m%n'
+ OZONE-SITE.XML_ozone.csi.s3g.address: http://s3g-0.s3g:9878
+ OZONE-SITE.XML_ozone.csi.socket: /var/lib/csi/csi.sock
+ OZONE-SITE.XML_ozone.csi.owner: hadoop
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-node-daemonset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-node-daemonset.yaml
similarity index 100%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-node-daemonset.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-node-daemonset.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrole.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-clusterrole.yaml
similarity index 100%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrole.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-clusterrole.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrolebinding.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-clusterrolebinding.yaml
similarity index 97%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrolebinding.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-clusterrolebinding.yaml
index 2f2537c..bb8bdf8 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-ozone-clusterrolebinding.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-clusterrolebinding.yaml
@@ -21,7 +21,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: csi-ozone
- namespace: default
+ namespace: weekly-test
roleRef:
kind: ClusterRole
name: csi-ozone
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/LICENSE.header
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-serviceaccount.yaml
similarity index 89%
rename from hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/LICENSE.header
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-serviceaccount.yaml
index 635f0d9..41f7747 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/LICENSE.header
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-ozone-serviceaccount.yaml
@@ -13,3 +13,9 @@
# 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: v1
+kind: ServiceAccount
+metadata:
+ namespace: weekly-test
+ name: csi-ozone
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-provisioner-deployment.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-provisioner-deployment.yaml
similarity index 100%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/csi-provisioner-deployment.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/csi-provisioner-deployment.yaml
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
similarity index 100%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/org.apache.hadoop.ozone-csidriver.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/org.apache.hadoop.ozone-csidriver.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/ozone-storageclass.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/ozone-storageclass.yaml
similarity index 100%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/ozone-storageclass.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/csi/ozone-storageclass.yaml
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
index d3e9572..b74d58e 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
@@ -55,12 +55,12 @@ spec:
args:
- ozone
- datanode
- volumeMounts:
- - name: data
- mountPath: /data
envFrom:
- configMapRef:
name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
volumeClaimTemplates:
- metadata:
name: data
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
index d35c4dd..ad0b16e 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
@@ -54,12 +54,12 @@ spec:
tcpSocket:
port: 9862
initialDelaySeconds: 30
- volumeMounts:
- - name: data
- mountPath: /data
envFrom:
- configMapRef:
name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
volumes: []
volumeClaimTemplates:
- metadata:
diff --git
a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-deployment.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-deployment.yaml
similarity index 66%
rename from
hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-deployment.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-deployment.yaml
index b6cafc5..04edcec 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/pv-test/nginx-deployment.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-deployment.yaml
@@ -13,37 +13,38 @@
# 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: apps/v1
kind: Deployment
metadata:
- name: nginx
+ name: ozone-csi-test-webserver
labels:
- app: nginx
+ app: ozone-csi-test-webserver
annotations: {}
spec:
replicas: 1
selector:
matchLabels:
- app: nginx
+ app: ozone-csi-test-webserver
template:
metadata:
labels:
- app: nginx
- annotations: {}
+ app: ozone-csi-test-webserver
spec:
containers:
- - name: nginx
- image: nginx
- volumeMounts:
- - mountPath: /var/lib/www/html
- name: webroot
- env: []
- envFrom: []
+ - name: web
+ image: python:3.7.3-alpine3.8
+ args:
+ - python
+ - -m
+ - http.server
+ - --directory
+ - /www
+ volumeMounts:
+ - mountPath: /www
+ name: webroot
volumes:
- - name: webroot
- persistentVolumeClaim:
- claimName: nginx-storage
- readOnly: false
- - name: config
- configMap:
- name: nginx-conf
+ - name: webroot
+ persistentVolumeClaim:
+ claimName: ozone-csi-test-webserver
+ readOnly: false
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-storage-persistentvolumeclaim.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-persistentvolumeclaim.yaml
similarity index 96%
rename from
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-storage-persistentvolumeclaim.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-persistentvolumeclaim.yaml
index 5968b92..4b1e44b 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/pv-test/nginx-storage-persistentvolumeclaim.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-persistentvolumeclaim.yaml
@@ -17,7 +17,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
- name: nginx-storage
+ name: ozone-csi-test-webserver
labels: {}
annotations: {}
spec:
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-service.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-service.yaml
similarity index 85%
rename from hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-service.yaml
rename to
hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-service.yaml
index 617277d..6a53a43 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-service.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/pv-test/ozone-csi-test-webserver-service.yaml
@@ -17,12 +17,13 @@
apiVersion: v1
kind: Service
metadata:
- name: om
+ name: ozone-csi-test-webserver
+ labels: {}
+ annotations: {}
spec:
+ type: NodePort
ports:
- - port: 9874
- name: ui
- clusterIP: None
+ - port: 8000
+ name: web
selector:
- app: ozone
- component: om
+ app: ozone-csi-test-webserver
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
index adc277a..6e96fb7 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
@@ -44,12 +44,12 @@ spec:
path: /
port: 9878
initialDelaySeconds: 30
- volumeMounts:
- - name: data
- mountPath: /data
envFrom:
- configMapRef:
name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
volumeClaimTemplates:
- metadata:
name: data
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
index 780fdd7..d4d6513 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
@@ -46,12 +46,12 @@ spec:
- ozone
- scm
- --init
- volumeMounts:
- - name: data
- mountPath: /data
envFrom:
- configMapRef:
name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
containers:
- name: scm
image: '@docker.image@'
@@ -62,12 +62,12 @@ spec:
tcpSocket:
port: 9861
initialDelaySeconds: 30
- volumeMounts:
- - name: data
- mountPath: /data
envFrom:
- configMapRef:
name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
volumeClaimTemplates:
- metadata:
name: data
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
