fix application specs (#1106)

2020-09-12 00:32:14 +10:00 · 2020-09-12 00:32:14 +10:00 · 365b59846a
parent 3fd1c71143
commit 365b59846a
18 changed files with 194 additions and 177 deletions
--- a/cert-manager/cert-manager/overlays/application/application.yaml
+++ b/cert-manager/cert-manager/overlays/application/application.yaml
@ -32,3 +32,4 @@ spec:
    links:
    - description: About
      url: "https://github.com/jetstack/cert-manager"
+  addOwnerRef: true
--- a/kfserving/kfserving-install/overlays/application/application.yaml
+++ b/kfserving/kfserving-install/overlays/application/application.yaml
@ -11,7 +11,6 @@ spec:
      app.kubernetes.io/component: kfserving-install
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: v0.3.0
-  type: "kfserving"
  componentKinds:
    - group: apps/v1
      kind: StatefulSet
@ -23,18 +22,20 @@ spec:
      kind: Secret
    - group: v1
      kind: ConfigMap
-  version: "v1alpha2"
-  description: "KFServing provides a Kubernetes Custom Resource Definition for serving ML Models on arbitrary frameworks"
-  icons:
-  maintainers:
-    - name: Johnu George
-      email: johnugeo@cisco.com
-  owners:
-    - name: Johnu George
-      email: johnugeo@cisco.com
-  keywords:
-   - "kfserving"
-   - "inference"
-  links:
-    - description: About
-      url: "https://github.com/kubeflow/kfserving"
+  descriptor:
+    type: "kfserving"
+    version: "v1alpha2"
+    description: "KFServing provides a Kubernetes Custom Resource Definition for serving ML Models on arbitrary frameworks"
+    maintainers:
+      - name: Johnu George
+        email: johnugeo@cisco.com
+    owners:
+      - name: Johnu George
+        email: johnugeo@cisco.com
+    keywords:
+     - "kfserving"
+     - "inference"
+    links:
+      - description: About
+        url: "https://github.com/kubeflow/kfserving"
+  addOwnerRef: true
--- a/mpi-job/mpi-operator/overlays/application/application.yaml
+++ b/mpi-job/mpi-operator/overlays/application/application.yaml
@ -40,3 +40,4 @@ spec:
    links:
    - description: About
      url: "https://github.com/kubeflow/mpi-operator"
+  addOwnerRef: true
--- a/seldon/seldon-core-operator/overlays/application/application.yaml
+++ b/seldon/seldon-core-operator/overlays/application/application.yaml
@ -3,6 +3,14 @@ kind: Application
 metadata:
  name: seldon-core-operator
 spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: seldon
+      app.kubernetes.io/instance: seldon-1.2.1
+      app.kubernetes.io/managed-by: kfctl
+      app.kubernetes.io/name: seldon
+      app.kubernetes.io/part-of: kubeflow
+      app.kubernetes.io/version: '1.2.1'
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -14,28 +22,20 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: Seldon allows users to create ML Inference Graphs to deploy their models
-    and serve predictions
-  icons: null
-  keywords:
-  - seldon
-  - inference
-  links:
-  - description: Docs
-    url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
-  maintainers:
-  - email: dev@seldon.io
-    name: Seldon
-  owners:
-  - email: dev@seldon.io
-    name: Seldon
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: seldon
-      app.kubernetes.io/instance: seldon-1.2.1
-      app.kubernetes.io/managed-by: kfctl
-      app.kubernetes.io/name: seldon
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: '1.2.1'
-  type: seldon-core-operator
-  version: v1
+  descriptor:
+    type: seldon-core-operator
+    version: v1
+    description: "Seldon allows users to create ML Inference Graphs to deploy their models and serve predictions"
+    maintainers:
+    - email: dev@seldon.io
+      name: Seldon
+    owners:
+    - email: dev@seldon.io
+      name: Seldon
+    keywords:
+    - seldon
+    - inference
+    links:
+    - description: Docs
+      url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
+  addOwnerRef: true
--- a/tests/stacks/aws/application/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
+++ b/tests/stacks/aws/application/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
@ -8,6 +8,7 @@ metadata:
  name: cert-manager
  namespace: cert-manager
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: rbac
    kind: ClusterRole
--- a/tests/stacks/aws/test_data/expected/app.k8s.io_v1beta1_application_mpi-operator.yaml
+++ b/tests/stacks/aws/test_data/expected/app.k8s.io_v1beta1_application_mpi-operator.yaml
@ -7,6 +7,7 @@ metadata:
  name: mpi-operator
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps
    kind: Deployment
--- a/tests/stacks/aws/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
+++ b/tests/stacks/aws/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
@ -7,6 +7,7 @@ metadata:
  name: seldon-core-operator
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -18,21 +19,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: Seldon allows users to create ML Inference Graphs to deploy their models
-    and serve predictions
-  icons: null
-  keywords:
-  - seldon
-  - inference
-  links:
-  - description: Docs
-    url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
-  maintainers:
-  - email: dev@seldon.io
-    name: Seldon
-  owners:
-  - email: dev@seldon.io
-    name: Seldon
+  descriptor:
+    description: Seldon allows users to create ML Inference Graphs to deploy their
+      models and serve predictions
+    keywords:
+    - seldon
+    - inference
+    links:
+    - description: Docs
+      url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
+    maintainers:
+    - email: dev@seldon.io
+      name: Seldon
+    owners:
+    - email: dev@seldon.io
+      name: Seldon
+    type: seldon-core-operator
+    version: v1
  selector:
    matchLabels:
      app.kubernetes.io/component: seldon
@ -41,5 +44,3 @@ spec:
      app.kubernetes.io/name: seldon
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: 1.2.1
-  type: seldon-core-operator
-  version: v1
--- a/tests/stacks/examples/alice/test_data/expected/app.k8s.io_v1beta1_application_kfserving.yaml
+++ b/tests/stacks/examples/alice/test_data/expected/app.k8s.io_v1beta1_application_kfserving.yaml
@ -9,6 +9,7 @@ metadata:
  name: kfserving
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -20,21 +21,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: KFServing provides a Kubernetes Custom Resource Definition for serving
-    ML Models on arbitrary frameworks
-  icons: null
-  keywords:
-  - kfserving
-  - inference
-  links:
-  - description: About
-    url: https://github.com/kubeflow/kfserving
-  maintainers:
-  - email: johnugeo@cisco.com
-    name: Johnu George
-  owners:
-  - email: johnugeo@cisco.com
-    name: Johnu George
+  descriptor:
+    description: KFServing provides a Kubernetes Custom Resource Definition for serving
+      ML Models on arbitrary frameworks
+    keywords:
+    - kfserving
+    - inference
+    links:
+    - description: About
+      url: https://github.com/kubeflow/kfserving
+    maintainers:
+    - email: johnugeo@cisco.com
+      name: Johnu George
+    owners:
+    - email: johnugeo@cisco.com
+      name: Johnu George
+    type: kfserving
+    version: v1alpha2
  selector:
    matchLabels:
      app.kubernetes.io/component: kfserving-install
@ -43,5 +46,3 @@ spec:
      app.kubernetes.io/name: kfserving-install
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: v0.3.0
-  type: kfserving
-  version: v1alpha2
--- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_kfserving.yaml
+++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_kfserving.yaml
@ -9,6 +9,7 @@ metadata:
  name: kfserving
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -20,21 +21,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: KFServing provides a Kubernetes Custom Resource Definition for serving
-    ML Models on arbitrary frameworks
-  icons: null
-  keywords:
-  - kfserving
-  - inference
-  links:
-  - description: About
-    url: https://github.com/kubeflow/kfserving
-  maintainers:
-  - email: johnugeo@cisco.com
-    name: Johnu George
-  owners:
-  - email: johnugeo@cisco.com
-    name: Johnu George
+  descriptor:
+    description: KFServing provides a Kubernetes Custom Resource Definition for serving
+      ML Models on arbitrary frameworks
+    keywords:
+    - kfserving
+    - inference
+    links:
+    - description: About
+      url: https://github.com/kubeflow/kfserving
+    maintainers:
+    - email: johnugeo@cisco.com
+      name: Johnu George
+    owners:
+    - email: johnugeo@cisco.com
+      name: Johnu George
+    type: kfserving
+    version: v1alpha2
  selector:
    matchLabels:
      app.kubernetes.io/component: kfserving-install
@ -43,5 +46,3 @@ spec:
      app.kubernetes.io/name: kfserving-install
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: v0.3.0
-  type: kfserving
-  version: v1alpha2
--- a/tests/stacks/ibm/application/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
+++ b/tests/stacks/ibm/application/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
@ -8,6 +8,7 @@ metadata:
  name: cert-manager
  namespace: cert-manager
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: rbac
    kind: ClusterRole
--- a/tests/stacks/ibm/multi-user/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
+++ b/tests/stacks/ibm/multi-user/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
@ -7,6 +7,7 @@ metadata:
  name: seldon-core-operator
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -18,21 +19,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: Seldon allows users to create ML Inference Graphs to deploy their models
-    and serve predictions
-  icons: null
-  keywords:
-  - seldon
-  - inference
-  links:
-  - description: Docs
-    url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
-  maintainers:
-  - email: dev@seldon.io
-    name: Seldon
-  owners:
-  - email: dev@seldon.io
-    name: Seldon
+  descriptor:
+    description: Seldon allows users to create ML Inference Graphs to deploy their
+      models and serve predictions
+    keywords:
+    - seldon
+    - inference
+    links:
+    - description: Docs
+      url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
+    maintainers:
+    - email: dev@seldon.io
+      name: Seldon
+    owners:
+    - email: dev@seldon.io
+      name: Seldon
+    type: seldon-core-operator
+    version: v1
  selector:
    matchLabels:
      app.kubernetes.io/component: seldon
@ -41,5 +44,3 @@ spec:
      app.kubernetes.io/name: seldon
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: 1.2.1
-  type: seldon-core-operator
-  version: v1
--- a/tests/stacks/ibm/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
+++ b/tests/stacks/ibm/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
@ -7,6 +7,7 @@ metadata:
  name: seldon-core-operator
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -18,21 +19,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: Seldon allows users to create ML Inference Graphs to deploy their models
-    and serve predictions
-  icons: null
-  keywords:
-  - seldon
-  - inference
-  links:
-  - description: Docs
-    url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
-  maintainers:
-  - email: dev@seldon.io
-    name: Seldon
-  owners:
-  - email: dev@seldon.io
-    name: Seldon
+  descriptor:
+    description: Seldon allows users to create ML Inference Graphs to deploy their
+      models and serve predictions
+    keywords:
+    - seldon
+    - inference
+    links:
+    - description: Docs
+      url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
+    maintainers:
+    - email: dev@seldon.io
+      name: Seldon
+    owners:
+    - email: dev@seldon.io
+      name: Seldon
+    type: seldon-core-operator
+    version: v1
  selector:
    matchLabels:
      app.kubernetes.io/component: seldon
@ -41,5 +44,3 @@ spec:
      app.kubernetes.io/name: seldon
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: 1.2.1
-  type: seldon-core-operator
-  version: v1
--- a/tests/stacks/kubernetes/application/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
+++ b/tests/stacks/kubernetes/application/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
@ -8,6 +8,7 @@ metadata:
  name: cert-manager
  namespace: cert-manager
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: rbac
    kind: ClusterRole
--- a/tests/stacks/kubernetes/test_data/expected/app.k8s.io_v1beta1_application_mpi-operator.yaml
+++ b/tests/stacks/kubernetes/test_data/expected/app.k8s.io_v1beta1_application_mpi-operator.yaml
@ -7,6 +7,7 @@ metadata:
  name: mpi-operator
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps
    kind: Deployment
--- a/tests/stacks/kubernetes/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
+++ b/tests/stacks/kubernetes/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
@ -7,6 +7,7 @@ metadata:
  name: seldon-core-operator
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -18,21 +19,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: Seldon allows users to create ML Inference Graphs to deploy their models
-    and serve predictions
-  icons: null
-  keywords:
-  - seldon
-  - inference
-  links:
-  - description: Docs
-    url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
-  maintainers:
-  - email: dev@seldon.io
-    name: Seldon
-  owners:
-  - email: dev@seldon.io
-    name: Seldon
+  descriptor:
+    description: Seldon allows users to create ML Inference Graphs to deploy their
+      models and serve predictions
+    keywords:
+    - seldon
+    - inference
+    links:
+    - description: Docs
+      url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
+    maintainers:
+    - email: dev@seldon.io
+      name: Seldon
+    owners:
+    - email: dev@seldon.io
+      name: Seldon
+    type: seldon-core-operator
+    version: v1
  selector:
    matchLabels:
      app.kubernetes.io/component: seldon
@ -41,5 +44,3 @@ spec:
      app.kubernetes.io/name: seldon
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: 1.2.1
-  type: seldon-core-operator
-  version: v1
--- a/tests/tests/legacy_kustomizations/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
+++ b/tests/tests/legacy_kustomizations/cert-manager/test_data/expected/app.k8s.io_v1beta1_application_cert-manager.yaml
@ -12,6 +12,7 @@ metadata:
  name: cert-manager
  namespace: cert-manager
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: rbac
    kind: ClusterRole
--- a/tests/tests/legacy_kustomizations/kfserving-install/test_data/expected/app.k8s.io_v1beta1_application_kfserving.yaml
+++ b/tests/tests/legacy_kustomizations/kfserving-install/test_data/expected/app.k8s.io_v1beta1_application_kfserving.yaml
@ -11,6 +11,7 @@ metadata:
  name: kfserving
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -22,21 +23,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: KFServing provides a Kubernetes Custom Resource Definition for serving
-    ML Models on arbitrary frameworks
-  icons: null
-  keywords:
-  - kfserving
-  - inference
-  links:
-  - description: About
-    url: https://github.com/kubeflow/kfserving
-  maintainers:
-  - email: johnugeo@cisco.com
-    name: Johnu George
-  owners:
-  - email: johnugeo@cisco.com
-    name: Johnu George
+  descriptor:
+    description: KFServing provides a Kubernetes Custom Resource Definition for serving
+      ML Models on arbitrary frameworks
+    keywords:
+    - kfserving
+    - inference
+    links:
+    - description: About
+      url: https://github.com/kubeflow/kfserving
+    maintainers:
+    - email: johnugeo@cisco.com
+      name: Johnu George
+    owners:
+    - email: johnugeo@cisco.com
+      name: Johnu George
+    type: kfserving
+    version: v1alpha2
  selector:
    matchLabels:
      app.kubernetes.io/component: kfserving-install
@ -45,5 +48,3 @@ spec:
      app.kubernetes.io/name: kfserving-install
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: v0.3.0
-  type: kfserving
-  version: v1alpha2
--- a/tests/tests/legacy_kustomizations/seldon-core-operator/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
+++ b/tests/tests/legacy_kustomizations/seldon-core-operator/test_data/expected/app.k8s.io_v1beta1_application_seldon-core-operator.yaml
@ -11,6 +11,7 @@ metadata:
  name: seldon-core-operator
  namespace: kubeflow
 spec:
+  addOwnerRef: true
  componentKinds:
  - group: apps/v1
    kind: StatefulSet
@ -22,21 +23,23 @@ spec:
    kind: Secret
  - group: v1
    kind: ConfigMap
-  description: Seldon allows users to create ML Inference Graphs to deploy their models
-    and serve predictions
-  icons: null
-  keywords:
-  - seldon
-  - inference
-  links:
-  - description: Docs
-    url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
-  maintainers:
-  - email: dev@seldon.io
-    name: Seldon
-  owners:
-  - email: dev@seldon.io
-    name: Seldon
+  descriptor:
+    description: Seldon allows users to create ML Inference Graphs to deploy their
+      models and serve predictions
+    keywords:
+    - seldon
+    - inference
+    links:
+    - description: Docs
+      url: https://docs.seldon.io/projects/seldon-core/en/v1.1.0/
+    maintainers:
+    - email: dev@seldon.io
+      name: Seldon
+    owners:
+    - email: dev@seldon.io
+      name: Seldon
+    type: seldon-core-operator
+    version: v1
  selector:
    matchLabels:
      app.kubernetes.io/component: seldon
@ -45,5 +48,3 @@ spec:
      app.kubernetes.io/name: seldon
      app.kubernetes.io/part-of: kubeflow
      app.kubernetes.io/version: 1.2.1
-  type: seldon-core-operator
-  version: v1