From fc9fe83cfd975fd025a5074f6673d5ef3294c7ad Mon Sep 17 00:00:00 2001 From: Mathew Wicks Date: Mon, 16 Nov 2020 14:05:04 +1100 Subject: [PATCH] fix mysql deployment strategy (#1562) (#1643) * fix mysql deployment strategy (#1562) (cherry picked from commit 6c4f2653abd13e6f866ef78f2fbd63adb1c89a49) * resolve tests for azure --- katib/katib-controller/base/katib-mysql-deployment.yaml | 2 ++ metadata/overlays/db/metadata-db-deployment.yaml | 4 +++- .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_katib-mysql.yaml | 2 ++ .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 2 ++ 26 files changed, 53 insertions(+), 1 deletion(-) diff --git a/katib/katib-controller/base/katib-mysql-deployment.yaml b/katib/katib-controller/base/katib-mysql-deployment.yaml index 543a3c9569..44417ee12c 100644 --- a/katib/katib-controller/base/katib-mysql-deployment.yaml +++ b/katib/katib-controller/base/katib-mysql-deployment.yaml @@ -11,6 +11,8 @@ spec: matchLabels: app: katib component: mysql + strategy: + type: Recreate template: metadata: name: katib-mysql diff --git a/metadata/overlays/db/metadata-db-deployment.yaml b/metadata/overlays/db/metadata-db-deployment.yaml index c766db38ac..88bde9d65c 100644 --- a/metadata/overlays/db/metadata-db-deployment.yaml +++ b/metadata/overlays/db/metadata-db-deployment.yaml @@ -5,10 +5,12 @@ metadata: labels: component: db spec: + replicas: 1 selector: matchLabels: component: db - replicas: 1 + strategy: + type: Recreate template: metadata: name: db diff --git a/tests/katib/installs/katib-standalone-ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/katib/installs/katib-standalone-ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml index be2e9e2b13..a40300472f 100644 --- a/tests/katib/installs/katib-standalone-ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/katib/installs/katib-standalone-ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/katib/installs/katib-standalone/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/katib/installs/katib-standalone/test_data/expected/apps_v1_deployment_katib-mysql.yaml index c122ae873f..e92ff7c8c4 100644 --- a/tests/katib/installs/katib-standalone/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/katib/installs/katib-standalone/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/aws/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/aws/test_data/expected/apps_v1_deployment_katib-mysql.yaml index c122ae873f..e92ff7c8c4 100644 --- a/tests/stacks/aws/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/aws/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/aws/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/aws/test_data/expected/apps_v1_deployment_metadata-db.yaml index 44ad98e9d8..749bc40837 100644 --- a/tests/stacks/aws/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/aws/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -12,6 +12,8 @@ spec: matchLabels: component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/azure/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/azure/test_data/expected/apps_v1_deployment_katib-mysql.yaml index c122ae873f..e92ff7c8c4 100644 --- a/tests/stacks/azure/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/azure/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/azure/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/azure/test_data/expected/apps_v1_deployment_metadata-db.yaml index 44ad98e9d8..749bc40837 100644 --- a/tests/stacks/azure/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/azure/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -12,6 +12,8 @@ spec: matchLabels: component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_katib-mysql.yaml index c122ae873f..e92ff7c8c4 100644 --- a/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_metadata-db.yaml index 44ad98e9d8..749bc40837 100644 --- a/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/examples/alice/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -12,6 +12,8 @@ spec: matchLabels: component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_katib-mysql.yaml index c122ae873f..e92ff7c8c4 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_metadata-db.yaml index 44ad98e9d8..749bc40837 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -12,6 +12,8 @@ spec: matchLabels: component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/generic/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/generic/test_data/expected/apps_v1_deployment_katib-mysql.yaml index c122ae873f..e92ff7c8c4 100644 --- a/tests/stacks/generic/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/generic/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/generic/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/generic/test_data/expected/apps_v1_deployment_metadata-db.yaml index 44ad98e9d8..749bc40837 100644 --- a/tests/stacks/generic/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/generic/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -12,6 +12,8 @@ spec: matchLabels: component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/ibm/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/ibm/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml index be2e9e2b13..a40300472f 100644 --- a/tests/stacks/ibm/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/ibm/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/ibm/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/ibm/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml index 420c69c4d3..07772c27d5 100644 --- a/tests/stacks/ibm/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/ibm/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/name: metadata component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_katib-mysql.yaml index be2e9e2b13..a40300472f 100644 --- a/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_metadata-db.yaml index 420c69c4d3..07772c27d5 100644 --- a/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/ibm/multi-user/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/name: metadata component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml index be2e9e2b13..a40300472f 100644 --- a/tests/stacks/ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/ibm/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/ibm/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/ibm/test_data/expected/apps_v1_deployment_metadata-db.yaml index 420c69c4d3..07772c27d5 100644 --- a/tests/stacks/ibm/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/ibm/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/name: metadata component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_katib-mysql.yaml index c122ae873f..e92ff7c8c4 100644 --- a/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_metadata-db.yaml index 44ad98e9d8..749bc40837 100644 --- a/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/kubernetes/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -12,6 +12,8 @@ spec: matchLabels: component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/openshift/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/stacks/openshift/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml index b7c2f3fd66..914b2a5e78 100644 --- a/tests/stacks/openshift/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/stacks/openshift/application/katib/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -16,6 +16,8 @@ spec: app.kubernetes.io/component: katib app.kubernetes.io/name: katib-controller component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml index 6c483e3361..6af9bf661e 100644 --- a/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -12,6 +12,8 @@ spec: matchLabels: component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/tests/legacy_kustomizations/katib-controller/test_data/expected/apps_v1_deployment_katib-mysql.yaml b/tests/tests/legacy_kustomizations/katib-controller/test_data/expected/apps_v1_deployment_katib-mysql.yaml index be12ad18df..88fce38153 100644 --- a/tests/tests/legacy_kustomizations/katib-controller/test_data/expected/apps_v1_deployment_katib-mysql.yaml +++ b/tests/tests/legacy_kustomizations/katib-controller/test_data/expected/apps_v1_deployment_katib-mysql.yaml @@ -24,6 +24,8 @@ spec: app.kubernetes.io/part-of: kubeflow app.kubernetes.io/version: 0.8.0 component: mysql + strategy: + type: Recreate template: metadata: annotations: diff --git a/tests/tests/legacy_kustomizations/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/tests/legacy_kustomizations/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml index 75ef2e3ad4..b105853719 100644 --- a/tests/tests/legacy_kustomizations/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/tests/legacy_kustomizations/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -24,6 +24,8 @@ spec: app.kubernetes.io/version: 0.2.1 component: db kustomize.component: metadata + strategy: + type: Recreate template: metadata: annotations: