Add v1beta1 and v1 kustomize manifest (#81)

kubeflow · Jun 26, 2020 · c583951 · c583951
1 parent 1e221d7
commit c583951
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,4 +7,4 @@ COPY mxnet-operator.v1 /opt/kubeflow
 RUN chmod a+x /opt/kubeflow/mxnet-operator.v1beta1
 RUN chmod a+x /opt/kubeflow/mxnet-operator.v1
 
-CMD ["/opt/kubeflow/mxnet-operator.v1", "--alsologtostderr", "-v=1"]
+CMD ["/opt/kubeflow/mxnet-operator.v1"]
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ and manage Apache MXNet jobs just like built-in K8S resources.
 ### Deploy MXJob CRD and Apache MXNet Operator
 
 ```
-kubectl create -k manifests
+kubectl create -k manifests/overlays/v1beta1/
 ```
 
 ### Verify that MXJob CRD and Apache MXNet Operator are installed

diff --git a/manifests/cluster-role-binding.yaml → manifests/base/cluster-role-binding.yaml b/manifests/cluster-role-binding.yaml → manifests/base/cluster-role-binding.yaml
diff --git a/manifests/cluster-role.yaml → manifests/base/cluster-role.yaml b/manifests/cluster-role.yaml → manifests/base/cluster-role.yaml
diff --git a/manifests/deployment.yaml → manifests/base/deployment.yaml b/manifests/deployment.yaml → manifests/base/deployment.yaml
diff --git a/manifests/kustomization.yaml → manifests/base/kustomization.yaml b/manifests/kustomization.yaml → manifests/base/kustomization.yaml
@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- crd-v1beta1.yaml
 - service-account.yaml
 - cluster-role.yaml
 - cluster-role-binding.yaml

diff --git a/manifests/podgroup.yaml → manifests/base/podgroup.yaml b/manifests/podgroup.yaml → manifests/base/podgroup.yaml
diff --git a/manifests/service-account.yaml → manifests/base/service-account.yaml b/manifests/service-account.yaml → manifests/base/service-account.yaml
diff --git a/manifests/crd-v1.yaml → manifests/overlays/v1/crd-v1.yaml b/manifests/crd-v1.yaml → manifests/overlays/v1/crd-v1.yaml
diff --git a/manifests/overlays/v1/deployment.yaml b/manifests/overlays/v1/deployment.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mxnet-operator
+spec:
+  template:
+    spec:
+      containers:
+      - name: mxnet-operator
+        image: kubeflow/mxnet-operator:v1.0.0-20200625
+
diff --git a/manifests/overlays/v1/kustomization.yaml b/manifests/overlays/v1/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+  - ../../base
+resources:
+- crd-v1.yaml
+
+patchesStrategicMerge:
+  - deployment.yaml
diff --git a/manifests/crd-v1beta1.yaml → manifests/overlays/v1beta1/crd-v1beta1.yaml b/manifests/crd-v1beta1.yaml → manifests/overlays/v1beta1/crd-v1beta1.yaml
diff --git a/manifests/overlays/v1beta1/kustomization.yaml b/manifests/overlays/v1beta1/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+  - ../../base
+resources:
+  - crd-v1beta1.yaml
+
+images:
+- name: mxjob/mxnet-operator
+  newTag: v1beta1