1322: Modified manifests to use all-in-one training-operator

manifests/base/cluster-role-binding.yaml

@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: tf-job-operator
-  name: tf-job-operator
+    app: training-operator
+  name: training-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: tf-job-operator
+  name: training-operator
 subjects:
 - kind: ServiceAccount
-  name: tf-job-operator
+  name: training-operator

manifests/base/cluster-role.yaml

@@ -3,8 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   labels:
-    app: tf-job-operator
-  name: tf-job-operator
+    app: training-operator
+  name: training-operator
 rules:
 - apiGroups:
   - kubeflow.org
@@ -48,24 +48,24 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: kubeflow-tfjobs-admin
+  name: kubeflow-training-admin
   labels:
     rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true"
 aggregationRule:
   clusterRoleSelectors:
   - matchLabels:
-      rbac.authorization.kubeflow.org/aggregate-to-kubeflow-tfjobs-admin: "true"
+      rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin: "true"
 rules: []
 
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: kubeflow-tfjobs-edit
+  name: kubeflow-training-edit
   labels:
     rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true"
-    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-tfjobs-admin: "true"
+    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin: "true"
 rules:
 - apiGroups:
   - kubeflow.org
@@ -87,7 +87,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: kubeflow-tfjobs-view
+  name: kubeflow-training-view
   labels:
     rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true"
 rules:

manifests/base/deployment.yaml

@@ -2,13 +2,13 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: tf-job-operator
+  name: training-operator
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        name: tf-job-operator
+        name: training-operator
       annotations:
         sidecar.istio.io/inject: "false"
     spec:
@@ -24,6 +24,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: public.ecr.aws/j1r0q0g6/training/tf-operator
-        name: tf-job-operator
-      serviceAccountName: tf-job-operator
+        image: public.ecr.aws/j1r0q0g6/training/training-operator
+        name: training-operator
+      serviceAccountName: training-operator

manifests/base/kustomization.yaml

@@ -2,14 +2,17 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-- crd.yaml
-- cluster-role-binding.yaml
-- cluster-role.yaml
-- deployment.yaml
-- service-account.yaml
-- service.yaml
+  - crd_tfjobs.yaml
+  - crd_mxjobs.yaml
+  - crd_pytorchjobs.yaml
+  - crd_xgboostjobs.yaml
+  - cluster-role-binding.yaml
+  - cluster-role.yaml
+  - deployment.yaml
+  - service-account.yaml
+  - service.yaml
 commonLabels:
-  app: tf-job-operator
-  kustomize.component: tf-job-operator
-  app.kubernetes.io/component: tfjob
-  app.kubernetes.io/name: tf-job-operator
+  app: training-operator
+  kustomize.component: training-operator
+  app.kubernetes.io/component: kubeflow-training
+  app.kubernetes.io/name: training-operator

manifests/base/service-account.yaml

@@ -2,5 +2,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: tf-job-operator
-  name: tf-job-operator
+    app: training-operator
+  name: training-operator

manifests/base/service.yaml

@@ -7,13 +7,13 @@ metadata:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8443"
   labels:
-    app: tf-job-operator
-  name: tf-job-operator
+    app: training-operator
+  name: training-operator
 spec:
   ports:
   - name: monitoring-port
     port: 8443
     targetPort: 8443
   selector:
-    name: tf-job-operator
+    name: training-operator
   type: ClusterIP

manifests/overlays/kubeflow/kustomization.yaml

@@ -2,13 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-- ../../base
+  - ../../base
 commonLabels:
-  app: tf-job-operator
-  kustomize.component: tf-job-operator
-  app.kubernetes.io/component: tfjob
-  app.kubernetes.io/name: tf-job-operator
+  app: training-operator
+  kustomize.component: training-operator
+  app.kubernetes.io/component: kubeflow-training
+  app.kubernetes.io/name: training-operator
 images:
-- name: public.ecr.aws/j1r0q0g6/training/tf-operator
-  newTag: 47a74b738920edbf4207160cec7e1dff9cdab3f2
-
+  - name: public.ecr.aws/j1r0q0g6/training/training-operator
+    newTag: cd2fc1ff397b1f349f68524f4abd5013a32e3033

manifests/overlays/standalone/kustomization.yaml

@@ -2,14 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-- ../../base
-- namespace.yaml
+  - ../../base
+  - namespace.yaml
 commonLabels:
-  app: tf-job-operator
-  kustomize.component: tf-job-operator
-  app.kubernetes.io/component: tfjob
-  app.kubernetes.io/name: tf-job-operator
+  app: training-operator
+  kustomize.component: training-operator
+  app.kubernetes.io/component: kubeflow-training
+  app.kubernetes.io/name: training-operator
 images:
-- name: public.ecr.aws/j1r0q0g6/training/tf-operator
-  newTag: 47a74b738920edbf4207160cec7e1dff9cdab3f2
-
+  - name: public.ecr.aws/j1r0q0g6/training/training-operator
+    newTag: cd2fc1ff397b1f349f68524f4abd5013a32e3033