From 2b01bc03f0ea3010c3f1fef7b4bbfe89d0518cdc Mon Sep 17 00:00:00 2001
From: Yannis Zarkadas <yanniszark@arrikto.com>
Date: Fri, 2 Apr 2021 02:54:19 +0300
Subject: [PATCH] Automated cherry pick of #1507: manifests: Remove Application
 CR Cherry pick of #1507 on release-0.11. #1507: manifests: Remove Application
 CR (#1509)

Remove Application CR as per:
https://github.com/kubeflow/manifests/issues/1715

Signed-off-by: Yannis Zarkadas <yanniszark@arrikto.com>
---
 .../kustomization.yaml                        |  4 --
 .../katib-application.yaml                    | 50 -------------------
 .../katib-with-kubeflow/kustomization.yaml    |  4 --
 3 files changed, 58 deletions(-)
 delete mode 100644 manifests/v1beta1/installs/katib-with-kubeflow/katib-application.yaml

diff --git a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml b/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml
index 89d4e4bbd77..ac0aac4102d 100644
--- a/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml
+++ b/manifests/v1beta1/installs/katib-with-kubeflow-cert-manager/kustomization.yaml
@@ -29,7 +29,6 @@ resources:
   # Cert-manager certificate for webhooks
   - certificate.yaml
   # Kubeflow Katib components.
-  - ../katib-with-kubeflow/katib-application.yaml
   - ../katib-with-kubeflow/kubeflow-katib-roles.yaml
   - ../katib-with-kubeflow/ui-virtual-service.yaml
 images:
@@ -58,9 +57,6 @@ patchesJson6902:
       kind: PersistentVolumeClaim
       namespace: kubeflow
 
-commonLabels:
-  app.kubernetes.io/component: katib
-
 vars:
 - fieldref:
     fieldPath: metadata.namespace
diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/katib-application.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/katib-application.yaml
deleted file mode 100644
index 1378bb09293..00000000000
--- a/manifests/v1beta1/installs/katib-with-kubeflow/katib-application.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: app.k8s.io/v1beta1
-kind: Application
-metadata:
-  name: katib
-spec:
-  addOwnerRef: true
-  componentKinds:
-    - group: core
-      kind: Service
-    - group: apps
-      kind: Deployment
-    - group: core
-      kind: Secret
-    - group: core
-      kind: ServiceAccount
-    - group: kubeflow.org
-      kind: Experiment
-    - group: kubeflow.org
-      kind: Suggestion
-    - group: kubeflow.org
-      kind: Trial
-  descriptor:
-    description: Katib is a service for AutoML.
-    keywords:
-      - katib
-      - automl
-      - hyperparameter tuning
-    links:
-      - description: About
-        url: https://github.com/kubeflow/katib
-    maintainers:
-      - email: gaoce@caicloud.io
-        name: Ce Gao
-      - email: johnugeo@cisco.com
-        name: Johnu George
-      - email: andrey.velichkevich@gmail.com
-        name: Andrey Velichkevich
-    owners:
-      - email: gaoce@caicloud.io
-        name: Ce Gao
-      - email: johnugeo@cisco.com
-        name: Johnu George
-      - email: andrey.velichkevich@gmail.com
-        name: Andrey Velichkevich
-    type: katib
-    version: v1beta1
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: katib
-      app.kubernetes.io/part-of: kubeflow
diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml
index 784690e7731..4a174967629 100644
--- a/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml
+++ b/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml
@@ -29,7 +29,6 @@ resources:
   - ../../components/webhook/rbac.yaml
   - ../../components/webhook/webhooks.yaml
   # Kubeflow Katib components.
-  - katib-application.yaml
   - kubeflow-katib-roles.yaml
   - ui-virtual-service.yaml
 images:
@@ -57,9 +56,6 @@ patchesJson6902:
       kind: PersistentVolumeClaim
       namespace: kubeflow
 
-commonLabels:
-  app.kubernetes.io/component: katib
-
 vars:
 - fieldref:
     fieldPath: metadata.namespace