diff --git a/admission-webhook/bootstrap/overlays/application/kustomization.yaml b/admission-webhook/bootstrap/overlays/application/kustomization.yaml index ef714889cf..ea76c634aa 100644 --- a/admission-webhook/bootstrap/overlays/application/kustomization.yaml +++ b/admission-webhook/bootstrap/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: bootstrap - app.kubernetes.io/instance: bootstrap-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: bootstrap - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: bootstrap +kind: Kustomization +resources: +- application.yaml diff --git a/admission-webhook/webhook/overlays/application/kustomization.yaml b/admission-webhook/webhook/overlays/application/kustomization.yaml index ec0bb41c1b..c7435438d8 100644 --- a/admission-webhook/webhook/overlays/application/kustomization.yaml +++ b/admission-webhook/webhook/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: webhook - app.kubernetes.io/instance: webhook-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: webhook - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: webhook +kind: Kustomization +resources: +- application.yaml diff --git a/admission-webhook/webhook/v3/kustomization.yaml b/admission-webhook/webhook/v3/kustomization.yaml index fc9eec17ab..df268964e7 100644 --- a/admission-webhook/webhook/v3/kustomization.yaml +++ b/admission-webhook/webhook/v3/kustomization.yaml @@ -1,16 +1,8 @@ -# TODO(https://github.com/kubeflow/manifests/issues/1052): Refactor -# and cleanup the kustomization once the v3 migration is done. apiVersion: kustomize.config.k8s.io/v1beta1 +commonLabels: + app.kubernetes.io/component: poddefaults + app.kubernetes.io/name: poddefaults kind: Kustomization resources: -# With v3 we want to always use cert-manager to get the -# self-signed certificate - ../overlays/cert-manager/ - ../overlays/application/application.yaml -commonLabels: - app.kubernetes.io/name: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/component: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 diff --git a/application/application/overlays/application/kustomization.yaml b/application/application/overlays/application/kustomization.yaml index efd2eeccb1..fcba25a239 100644 --- a/application/application/overlays/application/kustomization.yaml +++ b/application/application/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: kubeflow - app.kubernetes.io/instance: kubeflow-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: kubeflow - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: kubeflow +kind: Kustomization +resources: +- application.yaml diff --git a/argo/overlays/application/kustomization.yaml b/argo/overlays/application/kustomization.yaml index 0774d4f6fa..1f5a6feabc 100644 --- a/argo/overlays/application/kustomization.yaml +++ b/argo/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: argo - app.kubernetes.io/instance: argo-v2.3.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: argo - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v2.3.0 + app.kubernetes.io/name: argo +kind: Kustomization +resources: +- application.yaml diff --git a/aws/aws-alb-ingress-controller/overlays/application/kustomization.yaml b/aws/aws-alb-ingress-controller/overlays/application/kustomization.yaml index 632062d410..04a5cb53f1 100644 --- a/aws/aws-alb-ingress-controller/overlays/application/kustomization.yaml +++ b/aws/aws-alb-ingress-controller/overlays/application/kustomization.yaml @@ -1,13 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 +commonLabels: + app.kubernetes.io/component: aws-alb-ingress-controller + app.kubernetes.io/name: aws-alb-ingress-controller kind: Kustomization resources: - ../../base - application.yaml -commonLabels: - app.kubernetes.io/name: aws-alb-ingress-controller - app.kubernetes.io/instance: aws-alb-ingress-controller-v0.7.0 - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/component: aws-alb-ingress-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 - diff --git a/aws/aws-istio-authz-adaptor/overlays/application/kustomization.yaml b/aws/aws-istio-authz-adaptor/overlays/application/kustomization.yaml index c3b7ba77fc..2d18a3b74c 100644 --- a/aws/aws-istio-authz-adaptor/overlays/application/kustomization.yaml +++ b/aws/aws-istio-authz-adaptor/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: aws-istio-authz-adaptor - app.kubernetes.io/instance: aws-istio-authz-adaptor-0.1 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: aws-istio-authz-adaptor - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: "0.1" + app.kubernetes.io/name: aws-istio-authz-adaptor +kind: Kustomization +resources: +- application.yaml diff --git a/aws/nvidia-device-plugin/overlays/application/kustomization.yaml b/aws/nvidia-device-plugin/overlays/application/kustomization.yaml index 154b22f68e..d9a1edd7bc 100644 --- a/aws/nvidia-device-plugin/overlays/application/kustomization.yaml +++ b/aws/nvidia-device-plugin/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: nvidia-device-plugin - app.kubernetes.io/instance: nvidia-device-plugin-1.0.0-beta - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: nvidia-device-plugin - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0-beta + app.kubernetes.io/name: nvidia-device-plugin +kind: Kustomization +resources: +- application.yaml diff --git a/cert-manager/cert-manager/overlays/application/kustomization.yaml b/cert-manager/cert-manager/overlays/application/kustomization.yaml index 9696919994..8e83d18946 100644 --- a/cert-manager/cert-manager/overlays/application/kustomization.yaml +++ b/cert-manager/cert-manager/overlays/application/kustomization.yaml @@ -1,15 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml -configurations: -- params.yaml commonLabels: - app.kubernetes.io/name: cert-manager - app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: cert-manager - app.kubernetes.io/part-of: kubeflow - \ No newline at end of file + app.kubernetes.io/name: cert-manager +configurations: +- params.yaml +kind: Kustomization +resources: +- application.yaml diff --git a/cert-manager/cert-manager/v3/kustomization.yaml b/cert-manager/cert-manager/v3/kustomization.yaml index 371e88c9cd..977f3a3e21 100644 --- a/cert-manager/cert-manager/v3/kustomization.yaml +++ b/cert-manager/cert-manager/v3/kustomization.yaml @@ -1,13 +1,8 @@ -# TODO(https://github.com/kubeflow/manifests/issues/1052) clean up the manifests -# after the refactor is done. apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: cert-manager commonLabels: - app.kubernetes.io/name: cert-manager - app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: cert-manager - app.kubernetes.io/part-of: kubeflow + app.kubernetes.io/name: cert-manager +kind: Kustomization +namespace: cert-manager resources: - ../overlays/application/application.yaml diff --git a/common/centraldashboard/overlays/application/kustomization.yaml b/common/centraldashboard/overlays/application/kustomization.yaml index 603fcbb1f8..d08f6adee8 100644 --- a/common/centraldashboard/overlays/application/kustomization.yaml +++ b/common/centraldashboard/overlays/application/kustomization.yaml @@ -1,11 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 +commonLabels: + app.kubernetes.io/component: centraldashboard + app.kubernetes.io/name: centraldashboard kind: Kustomization resources: - application.yaml -commonLabels: - app.kubernetes.io/name: centraldashboard - app.kubernetes.io/instance: centraldashboard-v0.7.0 - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/component: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 diff --git a/common/centraldashboard/overlays/stacks/kustomization.yaml b/common/centraldashboard/overlays/stacks/kustomization.yaml index 6cfb221cf2..6998ba9b81 100644 --- a/common/centraldashboard/overlays/stacks/kustomization.yaml +++ b/common/centraldashboard/overlays/stacks/kustomization.yaml @@ -1,22 +1,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1 commonLabels: app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kind: Kustomization namespace: kubeflow +patchesStrategicMerge: +- deployment_kf_config.yaml resources: - ../../base_v3 -# TODO(jlewi): istio and application are really patches -# not "overlays" in that they are expected to be used as mixins. -# Perhaps move this into mixins to make this more obvious. - ../../overlays/istio - ../../overlays/application -patchesStrategicMerge: -# Pull in the patch which will configure central dashboard using a kubeflow -# configmap -- deployment_kf_config.yaml - diff --git a/common/spartakus/overlays/application/kustomization.yaml b/common/spartakus/overlays/application/kustomization.yaml index a469fc3828..3c900d86b5 100644 --- a/common/spartakus/overlays/application/kustomization.yaml +++ b/common/spartakus/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: spartakus - app.kubernetes.io/instance: spartakus-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: spartakus - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: spartakus +kind: Kustomization +resources: +- application.yaml diff --git a/gcp/basic-auth-ingress/overlays/application/kustomization.yaml b/gcp/basic-auth-ingress/overlays/application/kustomization.yaml index 8596baf335..e558d8be51 100644 --- a/gcp/basic-auth-ingress/overlays/application/kustomization.yaml +++ b/gcp/basic-auth-ingress/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: basic-auth-ingress - app.kubernetes.io/instance: basic-auth-ingress-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: basic-auth-ingress - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: basic-auth-ingress +kind: Kustomization +resources: +- application.yaml diff --git a/gcp/cloud-endpoints/overlays/application/kustomization.yaml b/gcp/cloud-endpoints/overlays/application/kustomization.yaml index 10f8245854..844385cea4 100644 --- a/gcp/cloud-endpoints/overlays/application/kustomization.yaml +++ b/gcp/cloud-endpoints/overlays/application/kustomization.yaml @@ -1,14 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kubeflow bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: cloud-endpoints - app.kubernetes.io/instance: cloud-endpoints-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: cloud-endpoints - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: cloud-endpoints +kind: Kustomization +namespace: kubeflow +resources: +- application.yaml diff --git a/gcp/gpu-driver/overlays/application/kustomization.yaml b/gcp/gpu-driver/overlays/application/kustomization.yaml index 622ab3707c..71b5877198 100644 --- a/gcp/gpu-driver/overlays/application/kustomization.yaml +++ b/gcp/gpu-driver/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: gpu-driver +kind: Kustomization +resources: +- application.yaml diff --git a/gcp/iap-ingress/overlays/application/kustomization.yaml b/gcp/iap-ingress/overlays/application/kustomization.yaml index 0d9cc79baf..1666d5f353 100644 --- a/gcp/iap-ingress/overlays/application/kustomization.yaml +++ b/gcp/iap-ingress/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: iap-ingress - app.kubernetes.io/instance: iap-ingress-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: iap-ingress - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: iap-ingress +kind: Kustomization +resources: +- application.yaml diff --git a/gcp/prometheus/overlays/application/kustomization.yaml b/gcp/prometheus/overlays/application/kustomization.yaml index 644030cfe7..674ade30cc 100644 --- a/gcp/prometheus/overlays/application/kustomization.yaml +++ b/gcp/prometheus/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: prometheus-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: prometheus - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: prometheus +kind: Kustomization +resources: +- application.yaml diff --git a/hack/generate_tests.py b/hack/generate_tests.py index 8849efba4d..1a8f304ec1 100755 --- a/hack/generate_tests.py +++ b/hack/generate_tests.py @@ -80,55 +80,6 @@ def find_kustomize_dirs(search_dirs): return changed_dirs -def remove_unmatched_tests(repo_root, package_dirs): - """Remove any tests that don't map to a kustomization.yaml file. - - This ensures tests don't linger if a package is deleted. - """ - - # Create a set of all the expected test names - expected_tests = set() - - for d in package_dirs: - rpath = os.path.relpath(d, repo_root) - expected_tests.add(generate_test_path(repo_root, rpath)) - - tests_dir = os.path.join(repo_root, "tests") - - possible_empty_dirs = [] - - # Walk the tests directory - for root, dirs, files in os.walk(tests_dir): - if not files: - possible_empty_dirs.append(root) - - for f in files: - if f != TEST_NAME: - continue - - full_test = os.path.join(root, f) - if full_test not in expected_tests: - logging.info("Removing unexpected test: %s", full_test) - os.unlink(full_test) - possible_empty_dirs.append(root) - - # Prune directories that only contain test_data but no more tests - for d in possible_empty_dirs: - if not os.path.exists(d): - # Might have been a subdirectory of a directory that was deleted. - continue - - items = os.listdir(d) - - if len(items) > 1: - continue - - if len(items) == 1 and items[0] != "test_data": - continue - - logging.info("Removing directory: %s", d) - shutil.rmtree(d) - def write_go_test(test_path, package_name, package_dir): """Write the go test file. @@ -176,8 +127,6 @@ def write_go_test(test_path, package_name, package_dir): full_search_dirs = [os.path.join(repo_root, s) for s in SEARCH_DIRS] package_dirs = find_kustomize_dirs(full_search_dirs) - remove_unmatched_tests(repo_root, package_dirs) - changed_dirs = package_dirs this_dir = os.path.dirname(__file__) diff --git a/hack/update-instance-labels.sh b/hack/update-instance-labels.sh deleted file mode 100755 index 65ecdd0bf7..0000000000 --- a/hack/update-instance-labels.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# -# TODO(jlewi): This script is outdated. You probably want to use -# kubeflow/testing/py/kubeflow/testing/tools/applications.py -# see https://github.com/kubeflow/testing/pull/596 - -# Replace 'app.kubernetes.io/version: v0.6.x' with 'app.kubernetes.io/version: v0.7.0' -grep -rl --exclude-dir={kfdef,gatekeeper,gcp/deployment_manager_configs,aws/infra_configs,docs,hack,plugins} 'app.kubernetes.io/version: v0.6' ./ \ - | xargs sed -i -E 's/app.kubernetes.io\/version: v0.6(.*)/app.kubernetes.io\/version: v0.7.0/g' - -# Replace 'app.kubernetes.io/instance: -v0.6.x' with 'app.kubernetes.io/instance: -v0.7.0' -grep -rl --exclude-dir={kfdef,gatekeeper,gcp/deployment_manager_configs,aws/infra_configs,docs,hack,plugins} 'app.kubernetes.io/instance: [a-z\-]*-v0.6' ./ \ - | xargs sed -i -E 's/app.kubernetes.io\/instance: (.+)-v0.6(.*)/app.kubernetes.io\/instance: \1-v0.7.0/g' diff --git a/istio/oidc-authservice/overlays/application/kustomization.yaml b/istio/oidc-authservice/overlays/application/kustomization.yaml index 6d83a87898..fbe38250d9 100644 --- a/istio/oidc-authservice/overlays/application/kustomization.yaml +++ b/istio/oidc-authservice/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: oidc-authservice - app.kubernetes.io/instance: oidc-authservice-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: oidc-authservice - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 \ No newline at end of file + app.kubernetes.io/name: oidc-authservice +kind: Kustomization +resources: +- application.yaml diff --git a/jupyter/jupyter-web-app/overlays/application/kustomization.yaml b/jupyter/jupyter-web-app/overlays/application/kustomization.yaml index 86e0cd9d5c..6cdc486367 100644 --- a/jupyter/jupyter-web-app/overlays/application/kustomization.yaml +++ b/jupyter/jupyter-web-app/overlays/application/kustomization.yaml @@ -1,11 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 +commonLabels: + app.kubernetes.io/component: jupyter-web-app + app.kubernetes.io/name: jupyter-web-app kind: Kustomization resources: - application.yaml -commonLabels: - app.kubernetes.io/name: jupyter-web-app - app.kubernetes.io/instance: jupyter-web-app-v0.7.0 - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/component: jupyter-web-app - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 diff --git a/jupyter/notebook-controller/base_v3/kustomization.yaml b/jupyter/notebook-controller/base_v3/kustomization.yaml index 4fac45cb25..b522d7b3ac 100644 --- a/jupyter/notebook-controller/base_v3/kustomization.yaml +++ b/jupyter/notebook-controller/base_v3/kustomization.yaml @@ -1,6 +1,24 @@ apiVersion: kustomize.config.k8s.io/v1beta1 +commonLabels: + app: notebook-controller + app.kubernetes.io/component: notebook-controller + app.kubernetes.io/name: notebook-controller + kustomize.component: notebook-controller +configMapGenerator: +- literals: + - USE_ISTIO=true + - ISTIO_GATEWAY=kubeflow/kubeflow-gateway + name: notebook-controller-config +images: +- name: gcr.io/kubeflow-images-public/notebook-controller + newName: gcr.io/kubeflow-images-public/notebook-controller + newTag: vmaster-gf39279c0 kind: Kustomization -resources: +namePrefix: notebook-controller- +namespace: kubeflow +patchesStrategicMerge: +- deployment_patch.yaml +resources: - ../base/cluster-role-binding.yaml - ../base/cluster-role.yaml - ../base/crd.yaml @@ -8,25 +26,3 @@ resources: - ../base/service-account.yaml - ../base/service.yaml - ../overlays/application/application.yaml -namePrefix: notebook-controller- -namespace: kubeflow -commonLabels: - app: notebook-controller - kustomize.component: notebook-controller - app.kubernetes.io/name: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/component: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 -patchesStrategicMerge: -- deployment_patch.yaml -images: -- name: gcr.io/kubeflow-images-public/notebook-controller - newName: gcr.io/kubeflow-images-public/notebook-controller - newTag: vmaster-gf39279c0 -configMapGenerator: -- name: notebook-controller-config - literals: - - USE_ISTIO=true - - ISTIO_GATEWAY=kubeflow/kubeflow-gateway diff --git a/jupyter/notebook-controller/overlays/application/kustomization.yaml b/jupyter/notebook-controller/overlays/application/kustomization.yaml index 7c2a99d0b5..de548477df 100644 --- a/jupyter/notebook-controller/overlays/application/kustomization.yaml +++ b/jupyter/notebook-controller/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 + app.kubernetes.io/name: notebook-controller +kind: Kustomization +resources: +- application.yaml diff --git a/katib/katib-controller/overlays/application/kustomization.yaml b/katib/katib-controller/overlays/application/kustomization.yaml index c694c280a7..a23cd3844b 100644 --- a/katib/katib-controller/overlays/application/kustomization.yaml +++ b/katib/katib-controller/overlays/application/kustomization.yaml @@ -3,10 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: katib - app.kubernetes.io/instance: katib-controller - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: katib-controller - app.kubernetes.io/part-of: kubeflow kind: Kustomization resources: - application.yaml diff --git a/katib/katib-controller/v3/kustomization.yaml b/katib/katib-controller/v3/kustomization.yaml index cf76fb51ac..f0f7c8f888 100644 --- a/katib/katib-controller/v3/kustomization.yaml +++ b/katib/katib-controller/v3/kustomization.yaml @@ -1,42 +1,39 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kubeflow -resources: - - ../base/katib-configmap.yaml - - ../base/katib-controller-deployment.yaml - - ../base/katib-controller-rbac.yaml - - ../base/katib-controller-secret.yaml - - ../base/katib-controller-service.yaml - - ../base/katib-mysql-deployment.yaml - - ../base/katib-mysql-pvc.yaml - - ../base/katib-mysql-secret.yaml - - ../base/katib-mysql-service.yaml - - ../base/katib-db-manager-deployment.yaml - - ../base/katib-db-manager-service.yaml - - ../base/katib-ui-deployment.yaml - - ../base/katib-ui-rbac.yaml - - ../base/katib-ui-service.yaml - - ../base/trial-template-configmap.yaml - - ../overlays/application/application.yaml - - ../overlays/istio/katib-ui-virtual-service.yaml -images: - - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller - newTag: v0.8.0 - newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller - - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager - newTag: v0.8.0 - newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager - - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui - newTag: v0.8.0 - newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui - - name: mysql - newTag: "8" - newName: mysql commonLabels: app.kubernetes.io/component: katib - app.kubernetes.io/instance: katib-controller - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: katib-controller - app.kubernetes.io/part-of: kubeflow configurations: - - params.yaml +- params.yaml +images: +- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller + newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller + newTag: v0.8.0 +- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager + newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager + newTag: v0.8.0 +- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui + newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui + newTag: v0.8.0 +- name: mysql + newName: mysql + newTag: "8" +kind: Kustomization +namespace: kubeflow +resources: +- ../base/katib-configmap.yaml +- ../base/katib-controller-deployment.yaml +- ../base/katib-controller-rbac.yaml +- ../base/katib-controller-secret.yaml +- ../base/katib-controller-service.yaml +- ../base/katib-mysql-deployment.yaml +- ../base/katib-mysql-pvc.yaml +- ../base/katib-mysql-secret.yaml +- ../base/katib-mysql-service.yaml +- ../base/katib-db-manager-deployment.yaml +- ../base/katib-db-manager-service.yaml +- ../base/katib-ui-deployment.yaml +- ../base/katib-ui-rbac.yaml +- ../base/katib-ui-service.yaml +- ../base/trial-template-configmap.yaml +- ../overlays/application/application.yaml +- ../overlays/istio/katib-ui-virtual-service.yaml diff --git a/katib/katib-crds/overlays/application/kustomization.yaml b/katib/katib-crds/overlays/application/kustomization.yaml index 0d8a97a9fb..e6734f99ac 100644 --- a/katib/katib-crds/overlays/application/kustomization.yaml +++ b/katib/katib-crds/overlays/application/kustomization.yaml @@ -3,10 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: katib - app.kubernetes.io/instance: katib-crds - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: katib-crds - app.kubernetes.io/part-of: kubeflow kind: Kustomization resources: - application.yaml diff --git a/katib/katib-crds/v3/kustomization.yaml b/katib/katib-crds/v3/kustomization.yaml index 873bfbd071..1a50e0def4 100644 --- a/katib/katib-crds/v3/kustomization.yaml +++ b/katib/katib-crds/v3/kustomization.yaml @@ -1,14 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kubeflow -resources: - - ../base/experiment-crd.yaml - - ../base/suggestion-crd.yaml - - ../base/trial-crd.yaml - - ../overlays/application/application.yaml commonLabels: app.kubernetes.io/component: katib - app.kubernetes.io/instance: katib-crds - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: katib-crds - app.kubernetes.io/part-of: kubeflow +kind: Kustomization +namespace: kubeflow +resources: +- ../base/experiment-crd.yaml +- ../base/suggestion-crd.yaml +- ../base/trial-crd.yaml +- ../overlays/application/application.yaml diff --git a/kfserving/kfserving-crds/overlays/application/kustomization.yaml b/kfserving/kfserving-crds/overlays/application/kustomization.yaml index b3146ae906..f7beb0dfb8 100644 --- a/kfserving/kfserving-crds/overlays/application/kustomization.yaml +++ b/kfserving/kfserving-crds/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: kfserving-crds - app.kubernetes.io/instance: kfserving-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: kfserving-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: kfserving-crds +kind: Kustomization +resources: +- application.yaml diff --git a/kfserving/kfserving-install/overlays/application/kustomization.yaml b/kfserving/kfserving-install/overlays/application/kustomization.yaml index f98e870779..e6cfca40e4 100644 --- a/kfserving/kfserving-install/overlays/application/kustomization.yaml +++ b/kfserving/kfserving-install/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: kfserving-install - app.kubernetes.io/instance: kfserving-install-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: kfserving-install - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: kfserving-install +kind: Kustomization +resources: +- application.yaml diff --git a/knative/knative-serving-crds/overlays/application/kustomization.yaml b/knative/knative-serving-crds/overlays/application/kustomization.yaml index 8b00b56800..ea9c6c7cc2 100644 --- a/knative/knative-serving-crds/overlays/application/kustomization.yaml +++ b/knative/knative-serving-crds/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: knative-serving-crds - app.kubernetes.io/instance: knative-serving-crds-v0.11.1 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: knative-serving-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.11.1 + app.kubernetes.io/name: knative-serving-crds +kind: Kustomization +resources: +- application.yaml diff --git a/knative/knative-serving-install/overlays/application/kustomization.yaml b/knative/knative-serving-install/overlays/application/kustomization.yaml index 29ae6e9b59..78f2d6f127 100644 --- a/knative/knative-serving-install/overlays/application/kustomization.yaml +++ b/knative/knative-serving-install/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: knative-serving-install - app.kubernetes.io/instance: knative-serving-install-v0.11.1 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: knative-serving-install - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.11.1 + app.kubernetes.io/name: knative-serving-install +kind: Kustomization +resources: +- application.yaml diff --git a/kubebench/overlays/application/kustomization.yaml b/kubebench/overlays/application/kustomization.yaml index a3e61323f6..fa8b381443 100644 --- a/kubebench/overlays/application/kustomization.yaml +++ b/kubebench/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: kubebench - app.kubernetes.io/instance: kubebench-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: kubebench - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: kubebench +kind: Kustomization +resources: +- application.yaml diff --git a/metadata/overlays/application/kustomization.yaml b/metadata/overlays/application/kustomization.yaml index 590c4d3d8a..a1297a1a1c 100644 --- a/metadata/overlays/application/kustomization.yaml +++ b/metadata/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: metadata - app.kubernetes.io/instance: metadata-0.2.1 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: metadata - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.1 kind: Kustomization resources: - application.yaml diff --git a/mpi-job/mpi-operator/overlays/application/kustomization.yaml b/mpi-job/mpi-operator/overlays/application/kustomization.yaml index ad5a6dd17b..0da42d7d59 100644 --- a/mpi-job/mpi-operator/overlays/application/kustomization.yaml +++ b/mpi-job/mpi-operator/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: mpi-operator - app.kubernetes.io/instance: mpi-operator - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: mpijob - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0 + app.kubernetes.io/name: mpi-operator +kind: Kustomization +resources: +- application.yaml diff --git a/mxnet-job/mxnet-operator/overlays/application/kustomization.yaml b/mxnet-job/mxnet-operator/overlays/application/kustomization.yaml index 0b5669095d..cb3e076d2e 100644 --- a/mxnet-job/mxnet-operator/overlays/application/kustomization.yaml +++ b/mxnet-job/mxnet-operator/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: mxnet-operator - app.kubernetes.io/instance: mxnet-operator-v0.7.0 app.kubernetes.io/component: mxnet - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: mxnet-operator +kind: Kustomization +resources: +- application.yaml diff --git a/pipeline/api-service/overlays/application/kustomization.yaml b/pipeline/api-service/overlays/application/kustomization.yaml index b6b7750beb..a42bf37b74 100644 --- a/pipeline/api-service/overlays/application/kustomization.yaml +++ b/pipeline/api-service/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: api-service - app.kubernetes.io/instance: api-service-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: api-service - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/minio/overlays/application/kustomization.yaml b/pipeline/minio/overlays/application/kustomization.yaml index 0148466929..d592946f21 100644 --- a/pipeline/minio/overlays/application/kustomization.yaml +++ b/pipeline/minio/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: minio - app.kubernetes.io/instance: minio-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: minio - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/mysql/overlays/application/kustomization.yaml b/pipeline/mysql/overlays/application/kustomization.yaml index 3df02b0774..b8183decb2 100644 --- a/pipeline/mysql/overlays/application/kustomization.yaml +++ b/pipeline/mysql/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: mysql - app.kubernetes.io/instance: mysql-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: mysql - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/persistent-agent/overlays/application/kustomization.yaml b/pipeline/persistent-agent/overlays/application/kustomization.yaml index 5bc6b752be..56f32854e4 100644 --- a/pipeline/persistent-agent/overlays/application/kustomization.yaml +++ b/pipeline/persistent-agent/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: persistent-agent - app.kubernetes.io/instance: persistent-agent-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: persistent-agent - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/pipeline-visualization-service/overlays/application/kustomization.yaml b/pipeline/pipeline-visualization-service/overlays/application/kustomization.yaml index 45b0be549a..ee88118753 100644 --- a/pipeline/pipeline-visualization-service/overlays/application/kustomization.yaml +++ b/pipeline/pipeline-visualization-service/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: pipeline-visualization-service - app.kubernetes.io/instance: pipeline-visualization-service-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pipeline-visualization-service - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/pipelines-runner/overlays/application/kustomization.yaml b/pipeline/pipelines-runner/overlays/application/kustomization.yaml index ec7c361c9d..0a36610340 100644 --- a/pipeline/pipelines-runner/overlays/application/kustomization.yaml +++ b/pipeline/pipelines-runner/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: pipelines-runner - app.kubernetes.io/instance: pipelines-runner-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pipelines-runner - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/pipelines-ui/overlays/application/kustomization.yaml b/pipeline/pipelines-ui/overlays/application/kustomization.yaml index 31d5ed5952..6a3747009b 100644 --- a/pipeline/pipelines-ui/overlays/application/kustomization.yaml +++ b/pipeline/pipelines-ui/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: pipelines-ui - app.kubernetes.io/instance: pipelines-ui-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pipelines-ui - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/pipelines-viewer/overlays/application/kustomization.yaml b/pipeline/pipelines-viewer/overlays/application/kustomization.yaml index f23f3171b3..9c95c91e7d 100644 --- a/pipeline/pipelines-viewer/overlays/application/kustomization.yaml +++ b/pipeline/pipelines-viewer/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: pipelines-viewer - app.kubernetes.io/instance: pipelines-viewer-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pipelines-viewer - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/pipeline/scheduledworkflow/overlays/application/kustomization.yaml b/pipeline/scheduledworkflow/overlays/application/kustomization.yaml index ed9a8a2a51..63b8d9743f 100644 --- a/pipeline/scheduledworkflow/overlays/application/kustomization.yaml +++ b/pipeline/scheduledworkflow/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: scheduledworkflow - app.kubernetes.io/instance: scheduledworkflow-0.2.5 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: scheduledworkflow - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: 0.2.5 kind: Kustomization resources: - application.yaml diff --git a/profiles/overlays/application/kustomization.yaml b/profiles/overlays/application/kustomization.yaml index ec7ab3cfbf..41d8e15f9f 100644 --- a/profiles/overlays/application/kustomization.yaml +++ b/profiles/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: profiles - app.kubernetes.io/instance: profiles-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: profiles - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: profiles +kind: Kustomization +resources: +- application.yaml diff --git a/pytorch-job/pytorch-job-crds/overlays/application/kustomization.yaml b/pytorch-job/pytorch-job-crds/overlays/application/kustomization.yaml index ff7aef45a1..8647a23c20 100644 --- a/pytorch-job/pytorch-job-crds/overlays/application/kustomization.yaml +++ b/pytorch-job/pytorch-job-crds/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: pytorch-job-crds - app.kubernetes.io/instance: pytorch-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: pytorch - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: pytorch-job-crds +kind: Kustomization +resources: +- application.yaml diff --git a/pytorch-job/pytorch-operator/overlays/application/kustomization.yaml b/pytorch-job/pytorch-operator/overlays/application/kustomization.yaml index c3d06371dc..3cfee77228 100644 --- a/pytorch-job/pytorch-operator/overlays/application/kustomization.yaml +++ b/pytorch-job/pytorch-operator/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/version: v0.7.0 app.kubernetes.io/component: pytorch - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/managed-by: kfctl + app.kubernetes.io/name: pytorch-operator +kind: Kustomization +resources: +- application.yaml diff --git a/seldon/seldon-core-operator/overlays/application/kustomization.yaml b/seldon/seldon-core-operator/overlays/application/kustomization.yaml index bb87f4aa38..905ed600a8 100644 --- a/seldon/seldon-core-operator/overlays/application/kustomization.yaml +++ b/seldon/seldon-core-operator/overlays/application/kustomization.yaml @@ -3,11 +3,7 @@ bases: - ../../base commonLabels: app.kubernetes.io/component: seldon - app.kubernetes.io/instance: seldon-1.15 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: seldon-core-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: '1.15' kind: Kustomization resources: - application.yaml diff --git a/spark/spark-operator/base/kustomization.yaml b/spark/spark-operator/base/kustomization.yaml index d1f05797ca..50eb16bb3e 100644 --- a/spark/spark-operator/base/kustomization.yaml +++ b/spark/spark-operator/base/kustomization.yaml @@ -1,25 +1,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kubeflow -# Labels to add to all resources and selectors. commonLabels: - kustomize.component: spark-operator - app.kubernetes.io/instance: spark-operator app.kubernetes.io/name: sparkoperator - -# Images modify the tags for images without -# creating patches. + kustomize.component: spark-operator images: - name: gcr.io/spark-operator/spark-operator - newTag: v1beta2-1.1.0-2.4.5 - -# Value of this field is prepended to the -# names of all resources newName: gcr.io/spark-operator/spark-operator + newTag: v1beta2-1.1.0-2.4.5 +kind: Kustomization namePrefix: spark-operator - -# List of resource files that kustomize reads, modifies -# and emits as a YAML string +namespace: kubeflow resources: - spark-sa.yaml - cr-clusterrole.yaml diff --git a/spark/spark-operator/overlays/application/kustomization.yaml b/spark/spark-operator/overlays/application/kustomization.yaml index 8830d46907..6a652ddd5f 100644 --- a/spark/spark-operator/overlays/application/kustomization.yaml +++ b/spark/spark-operator/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: sparkoperator - app.kubernetes.io/instance: spark-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: spark-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: sparkoperator +kind: Kustomization +resources: +- application.yaml diff --git a/tektoncd/tektoncd-dashboard/overlays/application/kustomization.yaml b/tektoncd/tektoncd-dashboard/overlays/application/kustomization.yaml index 124508618f..5ad6da134f 100644 --- a/tektoncd/tektoncd-dashboard/overlays/application/kustomization.yaml +++ b/tektoncd/tektoncd-dashboard/overlays/application/kustomization.yaml @@ -1,27 +1,23 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base +commonLabels: + app: tekton-dashboard + app.kubernetes.io/component: tektoncd + app.kubernetes.io/name: tektoncd-dashboard +configMapGenerator: +- env: params.env + name: tektoncd-dashboard-app-parameters +configurations: +- params.yaml +kind: Kustomization resources: - application.yaml -configMapGenerator: -- name: tektoncd-dashboard-app-parameters - env: params.env vars: -- name: generateName +- fieldref: + fieldPath: data.generateName + name: generateName objref: + apiVersion: v1 kind: ConfigMap name: tektoncd-dashboard-app-parameters - apiVersion: v1 - fieldref: - fieldpath: data.generateName -configurations: -- params.yaml -commonLabels: - app: tekton-dashboard - app.kubernetes.io/name: tektoncd-dashboard - app.kubernetes.io/instance: tektoncd-dashboard-v0.7.0 - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/component: tektoncd - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 diff --git a/tektoncd/tektoncd-install/overlays/application/kustomization.yaml b/tektoncd/tektoncd-install/overlays/application/kustomization.yaml index feb9ef7dcc..497945b541 100644 --- a/tektoncd/tektoncd-install/overlays/application/kustomization.yaml +++ b/tektoncd/tektoncd-install/overlays/application/kustomization.yaml @@ -1,26 +1,22 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base +commonLabels: + app.kubernetes.io/component: kubeflow + app.kubernetes.io/name: tektoncd-install +configMapGenerator: +- env: params.env + name: tektoncd-install-parameters +configurations: +- params.yaml +kind: Kustomization resources: - application.yaml -configMapGenerator: -- name: tektoncd-install-parameters - env: params.env vars: -- name: generateName +- fieldref: + fieldPath: data.generateName + name: generateName objref: + apiVersion: v1 kind: ConfigMap name: tektoncd-install-parameters - apiVersion: v1 - fieldref: - fieldpath: data.generateName -configurations: -- params.yaml -commonLabels: - app.kubernetes.io/name: tektoncd-install - app.kubernetes.io/instance: tektoncd-install-v0.7.0 - app.kubernetes.io/managed-by: kfctl - app.kubernetes.io/component: kubeflow - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 diff --git a/tests/Makefile b/tests/Makefile index b5982817ad..450644d921 100755 --- a/tests/Makefile +++ b/tests/Makefile @@ -32,7 +32,7 @@ gcp-reset: kpt cfg set ../gcp/v2/ cluster-name cluster-name kpt cfg set ../gcp/v2/ gcloud.core.project project-id -generate: clean +generate: $(PYTHON_BIN) ../hack/generate_tests.py --all || echo done $(GO) fmt ./... @@ -46,9 +46,6 @@ modules: test: modules @GO111MODULE=on $(GO) test -v github.com/kubeflow/manifests/tests/... -clean: - @rm -f $$(ls *_test.go | egrep -v 'kusttestharness_test.go|go.mod|go.sum') - run-unittest-plugin: cd .. && XDG_CONFIG_HOME=$$(pwd)/plugins kustomize build profiles/overlays/test --enable_alpha_plugins diff --git a/tests/go.mod b/tests/go.mod index b1ddeb34fb..a1ad5410d0 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -21,6 +21,7 @@ require ( github.com/go-openapi/jsonpointer v0.19.2 // indirect github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48 github.com/google/go-cmp v0.3.0 + github.com/google/martian v2.1.0+incompatible github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/hashicorp/go-getter v1.0.2 github.com/imdario/mergo v0.3.7 diff --git a/tests/go.sum b/tests/go.sum index b93720f54e..4aac47d4d6 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -247,6 +247,7 @@ github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSN github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml index 42c5ba57ac..9791664258 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml @@ -6,11 +6,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-mutating-webhook-configuration webhooks: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml index 82d4f80fe6..b6727510c6 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebooks.kubeflow.org spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml index c935bb9a54..808eb4db0c 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: poddefaults.kubeflow.org spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml index 3226854c81..2dc516cbcc 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml @@ -3,11 +3,7 @@ kind: CustomResourceDefinition metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: pytorchjobs.kubeflow.org spec: additionalPrinterColumns: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml index 2c9e7eedc5..ebfcefbc9b 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml @@ -3,11 +3,7 @@ kind: CustomResourceDefinition metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: tfjobs.kubeflow.org spec: additionalPrinterColumns: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml index 2efb44c0cd..a77aa95832 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml index cb18330f83..02b93d3a8a 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: gpu-driver namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml index da04751bb8..be3f76b96d 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml @@ -4,11 +4,7 @@ metadata: labels: app: jupyter-web-app app.kubernetes.io/component: jupyter-web-app - app.kubernetes.io/instance: jupyter-web-app-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: jupyter-web-app - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: jupyter-web-app name: jupyter-web-app-jupyter-web-app namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml index 353c9e4db0..f462651b3b 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-notebook-controller namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml index d3272d8b8e..56a1457579 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: pytorch-job-crds namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml index 7837629da0..44ea79a4b8 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: pytorch-operator namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml index 46acbea601..fc9715bb53 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: tf-job-crds namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml index 8a0b4524ab..6e38dd861e 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: tf-job-operator namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml index 8acf7bf325..fcf807af27 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: webhook namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml index 4c3e58c66f..d3ca074496 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml @@ -3,11 +3,7 @@ kind: DaemonSet metadata: labels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 k8s-app: nvidia-driver-installer kustomize.component: gpu-driver name: nvidia-driver-installer @@ -16,21 +12,13 @@ spec: selector: matchLabels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: gpu-driver template: metadata: labels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 k8s-app: nvidia-driver-installer kustomize.component: gpu-driver name: nvidia-driver-installer diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml index 32d071f030..8b8111f51b 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-deployment namespace: kubeflow @@ -17,11 +13,7 @@ spec: matchLabels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook template: metadata: @@ -30,11 +22,7 @@ spec: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook spec: containers: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml index 92c4ef046e..b81b6c91ad 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: @@ -17,11 +13,7 @@ spec: matchLabels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 template: metadata: annotations: @@ -29,11 +21,7 @@ spec: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 spec: containers: - env: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml index b867bfa01e..44d27f8695 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-deployment namespace: kubeflow @@ -17,11 +13,7 @@ spec: matchLabels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller template: metadata: @@ -30,11 +22,7 @@ spec: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller spec: containers: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml index 7eb5df4d4b..8897df4a5e 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml @@ -3,11 +3,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator namespace: kubeflow @@ -16,11 +12,7 @@ spec: selector: matchLabels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator template: @@ -29,11 +21,7 @@ spec: sidecar.istio.io/inject: "false" labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml index b6030a30ae..4c6c1acaf6 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml @@ -3,11 +3,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator namespace: kubeflow @@ -16,11 +12,7 @@ spec: selector: matchLabels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator template: metadata: @@ -28,11 +20,7 @@ spec: sidecar.istio.io/inject: "false" labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml index b45202d3d0..c9e1f4f031 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml @@ -3,11 +3,7 @@ kind: Certificate metadata: labels: app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: admission-webhook-cert namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml index 29caf97d7c..b08a52c193 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml @@ -3,11 +3,7 @@ kind: VirtualService metadata: labels: app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml index 9e871ad944..3ed69a58a6 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-cluster-role rules: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml index 4d5d4390e0..ae97df8cf3 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml @@ -8,11 +8,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: admission-webhook-kubeflow-poddefaults-admin diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml index b7428221ee..09813d57ad 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml @@ -8,11 +8,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" name: admission-webhook-kubeflow-poddefaults-edit diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml index 0683c8eec2..1a80b46609 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook rbac.authorization.kubeflow.org/aggregate-to-kubeflow-poddefaults-admin: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-poddefaults-edit: "true" diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml index 0c5d9a1742..7491bff88e 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard rules: - apiGroups: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml index 7dfa6d691d..161f232e59 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml @@ -7,11 +7,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: kubeflow-pytorchjobs-admin diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml index 367bd0b7ec..dc3ff5e791 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pytorchjobs-admin: "true" diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml index 57a2299112..39daa100ad 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" name: kubeflow-pytorchjobs-view diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml index 453d3fe571..03147422e8 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml @@ -7,11 +7,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: kubeflow-tfjobs-admin diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml index 5fa96cb3cf..942e4a625a 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-tfjobs-admin: "true" diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml index 057db34a5e..3ebf508e03 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" name: kubeflow-tfjobs-view diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml index 9d16cdeae0..41459ef302 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml @@ -8,11 +8,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: notebook-controller-kubeflow-notebooks-admin diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml index af3ddf0156..3ae0c1cd8e 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-notebooks-admin: "true" diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml index 494d9f3768..9e28e08290 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" name: notebook-controller-kubeflow-notebooks-view diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml index 3fa1993956..02d880f8e2 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-role rules: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml index f1eb264bf7..48bed8ccb7 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-cluster-role-binding roleRef: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml index 76a9a9e597..d06cac3fd8 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml index 68874191ef..30d3f08b7e 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-role-binding roleRef: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml index b33cb84816..2bfa19ba0e 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow rules: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml index bf48de73c0..c1c4c30793 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow roleRef: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml index 71b6c0296c..7cf4368025 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator rules: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml index a6580bc604..ac48bdc241 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator rules: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml index 9dc6cd0075..cefdad39ee 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator roleRef: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml index 019534f941..b69f8e4e4b 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator roleRef: diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml index eaf2baac92..1dd6173c08 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml @@ -8,11 +8,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-admission-webhook-parameters namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml index 17e759ee8f..ca0dc1ba50 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml @@ -7,11 +7,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-notebook-controller-config-h4d668t5tb namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml index d8a0413c63..1636dc9520 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-service namespace: kubeflow @@ -19,9 +15,5 @@ spec: selector: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_centraldashboard.yaml index 76c10812af..3f50af45e4 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_centraldashboard.yaml @@ -13,11 +13,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: @@ -28,10 +24,6 @@ spec: selector: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 sessionAffinity: None type: ClusterIP diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml index 7e47bc3ebf..a9f1b4b8e0 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-service namespace: kubeflow @@ -18,9 +14,5 @@ spec: selector: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml index ea68e87d8f..4114ea5f9f 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml @@ -8,11 +8,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator namespace: kubeflow @@ -23,11 +19,7 @@ spec: targetPort: 8443 selector: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator type: ClusterIP diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml index 225d41703f..a13b8ac441 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml @@ -8,11 +8,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator namespace: kubeflow @@ -23,11 +19,7 @@ spec: targetPort: 8443 selector: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator type: ClusterIP diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml index 936f4baae8..6f41ce954d 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-service-account namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml index 9781f4a441..55deba785d 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml @@ -3,10 +3,6 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml index 6f534aa3ad..d34df92177 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-service-account namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml index 8fbfe5c5cc..3d3555c2b1 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml index bcf465b436..3e0982e277 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-dashboard app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-dashboard namespace: kubeflow diff --git a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml index 8ef6c83969..f7bf874b73 100644 --- a/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml +++ b/tests/stacks/examples/alice_gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml b/tests/stacks/gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml index 42c5ba57ac..9791664258 100644 --- a/tests/stacks/gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml +++ b/tests/stacks/gcp/test_data/expected/admissionregistration.k8s.io_v1beta1_mutatingwebhookconfiguration_admission-webhook-mutating-webhook-configuration.yaml @@ -6,11 +6,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-mutating-webhook-configuration webhooks: diff --git a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml index 82d4f80fe6..b6727510c6 100644 --- a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml +++ b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_notebooks.kubeflow.org.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebooks.kubeflow.org spec: diff --git a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml index c935bb9a54..808eb4db0c 100644 --- a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml +++ b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_poddefaults.kubeflow.org.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: poddefaults.kubeflow.org spec: diff --git a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml index 3226854c81..2dc516cbcc 100644 --- a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml +++ b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_pytorchjobs.kubeflow.org.yaml @@ -3,11 +3,7 @@ kind: CustomResourceDefinition metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: pytorchjobs.kubeflow.org spec: additionalPrinterColumns: diff --git a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml index 2c9e7eedc5..ebfcefbc9b 100644 --- a/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml +++ b/tests/stacks/gcp/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_tfjobs.kubeflow.org.yaml @@ -3,11 +3,7 @@ kind: CustomResourceDefinition metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: tfjobs.kubeflow.org spec: additionalPrinterColumns: diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml index 2efb44c0cd..a77aa95832 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml index cb18330f83..02b93d3a8a 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_gpu-driver.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: gpu-driver namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml index da04751bb8..be3f76b96d 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml @@ -4,11 +4,7 @@ metadata: labels: app: jupyter-web-app app.kubernetes.io/component: jupyter-web-app - app.kubernetes.io/instance: jupyter-web-app-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: jupyter-web-app - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: jupyter-web-app name: jupyter-web-app-jupyter-web-app namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml index 353c9e4db0..f462651b3b 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-notebook-controller namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml index d3272d8b8e..56a1457579 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-job-crds.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: pytorch-job-crds namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml index 7837629da0..44ea79a4b8 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_pytorch-operator.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: pytorch-operator namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml index 46acbea601..fc9715bb53 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-crds.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-crds - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: tf-job-crds namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml index 8a0b4524ab..6e38dd861e 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_tf-job-operator.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: tf-job-operator namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml index 8acf7bf325..fcf807af27 100644 --- a/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml +++ b/tests/stacks/gcp/test_data/expected/app.k8s.io_v1beta1_application_webhook.yaml @@ -3,11 +3,7 @@ kind: Application metadata: labels: app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: webhook namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml index 4c3e58c66f..d3ca074496 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_daemonset_nvidia-driver-installer.yaml @@ -3,11 +3,7 @@ kind: DaemonSet metadata: labels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 k8s-app: nvidia-driver-installer kustomize.component: gpu-driver name: nvidia-driver-installer @@ -16,21 +12,13 @@ spec: selector: matchLabels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: gpu-driver template: metadata: labels: app.kubernetes.io/component: gpu-driver - app.kubernetes.io/instance: gpu-driver-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: gpu-driver - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 k8s-app: nvidia-driver-installer kustomize.component: gpu-driver name: nvidia-driver-installer diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml index 32d071f030..8b8111f51b 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_admission-webhook-deployment.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-deployment namespace: kubeflow @@ -17,11 +13,7 @@ spec: matchLabels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook template: metadata: @@ -30,11 +22,7 @@ spec: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook spec: containers: diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml index a1195c1de0..74ad9f2527 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: @@ -17,11 +13,7 @@ spec: matchLabels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 template: metadata: annotations: @@ -29,11 +21,7 @@ spec: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 spec: containers: - env: diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml index b867bfa01e..44d27f8695 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_notebook-controller-deployment.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-deployment namespace: kubeflow @@ -17,11 +13,7 @@ spec: matchLabels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller template: metadata: @@ -30,11 +22,7 @@ spec: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller spec: containers: diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml index 7eb5df4d4b..8897df4a5e 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_pytorch-operator.yaml @@ -3,11 +3,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator namespace: kubeflow @@ -16,11 +12,7 @@ spec: selector: matchLabels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator template: @@ -29,11 +21,7 @@ spec: sidecar.istio.io/inject: "false" labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator spec: diff --git a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml index b6030a30ae..4c6c1acaf6 100644 --- a/tests/stacks/gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/apps_v1_deployment_tf-job-operator.yaml @@ -3,11 +3,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator namespace: kubeflow @@ -16,11 +12,7 @@ spec: selector: matchLabels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator template: metadata: @@ -28,11 +20,7 @@ spec: sidecar.istio.io/inject: "false" labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator spec: diff --git a/tests/stacks/gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml b/tests/stacks/gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml index b45202d3d0..c9e1f4f031 100644 --- a/tests/stacks/gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml +++ b/tests/stacks/gcp/test_data/expected/cert-manager.io_v1alpha2_certificate_admission-webhook-cert.yaml @@ -3,11 +3,7 @@ kind: Certificate metadata: labels: app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 name: admission-webhook-cert namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml index 29caf97d7c..b08a52c193 100644 --- a/tests/stacks/gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/networking.istio.io_v1alpha3_virtualservice_centraldashboard.yaml @@ -3,11 +3,7 @@ kind: VirtualService metadata: labels: app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml index 9e871ad944..3ed69a58a6 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-cluster-role.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-cluster-role rules: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml index 4d5d4390e0..ae97df8cf3 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-admin.yaml @@ -8,11 +8,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: admission-webhook-kubeflow-poddefaults-admin diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml index b7428221ee..09813d57ad 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-edit.yaml @@ -8,11 +8,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" name: admission-webhook-kubeflow-poddefaults-edit diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml index 0683c8eec2..1a80b46609 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_admission-webhook-kubeflow-poddefaults-view.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook rbac.authorization.kubeflow.org/aggregate-to-kubeflow-poddefaults-admin: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-poddefaults-edit: "true" diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml index 0c5d9a1742..7491bff88e 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard rules: - apiGroups: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml index 7dfa6d691d..161f232e59 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-admin.yaml @@ -7,11 +7,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: kubeflow-pytorchjobs-admin diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml index 367bd0b7ec..dc3ff5e791 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-edit.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pytorchjobs-admin: "true" diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml index 57a2299112..39daa100ad 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-pytorchjobs-view.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" name: kubeflow-pytorchjobs-view diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml index 453d3fe571..03147422e8 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-admin.yaml @@ -7,11 +7,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: kubeflow-tfjobs-admin diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml index 5fa96cb3cf..942e4a625a 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-edit.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-tfjobs-admin: "true" diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml index 057db34a5e..3ebf508e03 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_kubeflow-tfjobs-view.yaml @@ -3,11 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" name: kubeflow-tfjobs-view diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml index 9d16cdeae0..41459ef302 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-admin.yaml @@ -8,11 +8,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" name: notebook-controller-kubeflow-notebooks-admin diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml index af3ddf0156..3ae0c1cd8e 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-edit.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-notebooks-admin: "true" diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml index 494d9f3768..9e28e08290 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-kubeflow-notebooks-view.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" name: notebook-controller-kubeflow-notebooks-view diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml index 3fa1993956..02d880f8e2 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrole_notebook-controller-role.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-role rules: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml index f1eb264bf7..48bed8ccb7 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_admission-webhook-cluster-role-binding.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-cluster-role-binding roleRef: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml index 76a9a9e597..d06cac3fd8 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml index 68874191ef..30d3f08b7e 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_clusterrolebinding_notebook-controller-role-binding.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-role-binding roleRef: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml index b33cb84816..2bfa19ba0e 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_role_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow rules: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml index bf48de73c0..c1c4c30793 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1_rolebinding_centraldashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow roleRef: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml index 71b6c0296c..7cf4368025 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_pytorch-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator rules: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml index a6580bc604..ac48bdc241 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrole_tf-job-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator rules: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml index 9dc6cd0075..cefdad39ee 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_pytorch-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator roleRef: diff --git a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml index 019534f941..b69f8e4e4b 100644 --- a/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/rbac.authorization.k8s.io_v1beta1_clusterrolebinding_tf-job-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator roleRef: diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml index eaf2baac92..1dd6173c08 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_configmap_admission-webhook-admission-webhook-parameters.yaml @@ -8,11 +8,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-admission-webhook-parameters namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml index 17e759ee8f..ca0dc1ba50 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_configmap_notebook-controller-notebook-controller-config-h4d668t5tb.yaml @@ -7,11 +7,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-notebook-controller-config-h4d668t5tb namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml index d8a0413c63..1636dc9520 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_service_admission-webhook-service.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-service namespace: kubeflow @@ -19,9 +15,5 @@ spec: selector: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_service_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_service_centraldashboard.yaml index 76c10812af..3f50af45e4 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_service_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_service_centraldashboard.yaml @@ -13,11 +13,7 @@ metadata: labels: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow spec: @@ -28,10 +24,6 @@ spec: selector: app: centraldashboard app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 sessionAffinity: None type: ClusterIP diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml index 7e47bc3ebf..a9f1b4b8e0 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_service_notebook-controller-service.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-service namespace: kubeflow @@ -18,9 +14,5 @@ spec: selector: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml index ea68e87d8f..4114ea5f9f 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_service_pytorch-operator.yaml @@ -8,11 +8,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator namespace: kubeflow @@ -23,11 +19,7 @@ spec: targetPort: 8443 selector: app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator type: ClusterIP diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml index 225d41703f..a13b8ac441 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_service_tf-job-operator.yaml @@ -8,11 +8,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator namespace: kubeflow @@ -23,11 +19,7 @@ spec: targetPort: 8443 selector: app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator type: ClusterIP diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml index 936f4baae8..6f41ce954d 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_admission-webhook-service-account.yaml @@ -4,11 +4,7 @@ metadata: labels: app: admission-webhook app.kubernetes.io/component: poddefaults - app.kubernetes.io/instance: poddefaults-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: poddefaults - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: admission-webhook name: admission-webhook-service-account namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml index 9781f4a441..55deba785d 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_centraldashboard.yaml @@ -3,10 +3,6 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: centraldashboard - app.kubernetes.io/instance: centraldashboard-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: centraldashboard - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 name: centraldashboard namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml index 6f534aa3ad..d34df92177 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_notebook-controller-service-account.yaml @@ -4,11 +4,7 @@ metadata: labels: app: notebook-controller app.kubernetes.io/component: notebook-controller - app.kubernetes.io/instance: notebook-controller-v1.0.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: notebook-controller - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v1.0.0 kustomize.component: notebook-controller name: notebook-controller-service-account namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml index 8fbfe5c5cc..3d3555c2b1 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_pytorch-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: pytorch-operator app.kubernetes.io/component: pytorch - app.kubernetes.io/instance: pytorch-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: pytorch-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: pytorch-operator name: pytorch-operator namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml index bcf465b436..3e0982e277 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-dashboard.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-dashboard app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-dashboard namespace: kubeflow diff --git a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml index 8ef6c83969..f7bf874b73 100644 --- a/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml +++ b/tests/stacks/gcp/test_data/expected/~g_v1_serviceaccount_tf-job-operator.yaml @@ -4,11 +4,7 @@ metadata: labels: app: tf-job-operator app.kubernetes.io/component: tfjob - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 kustomize.component: tf-job-operator name: tf-job-operator namespace: kubeflow diff --git a/tests/tools/fix_common_labels.go b/tests/tools/fix_common_labels.go new file mode 100644 index 0000000000..940cfbe5dd --- /dev/null +++ b/tests/tools/fix_common_labels.go @@ -0,0 +1,123 @@ +// fix_common_labels.go is a run once program to fix the commonLabels in Kubeflow +// kustomization files. Per https://github.com/kubeflow/manifests/issues/1131 commonLabels should be immutable. +// Our commonLabels violated this because we were including version. +// This is a simple program to remove those from commonLabels. +package main + +import ( + "github.com/ghodss/yaml" + "github.com/google/martian/log" + "github.com/pkg/errors" + "io/ioutil" + "os" + "path/filepath" + "sigs.k8s.io/kustomize/v3/pkg/types" +) + +const ( + VersionLabel = "app.kubernetes.io/version" + ManagedByLabel = "app.kubernetes.io/managed-by" + InstanceLabel = "app.kubernetes.io/instance" + PartOfLabel = "app.kubernetes.io/part-of" + KustomizationFile = "kustomization.yaml" +) + +// readKustomization will read a kustomization.yaml and return the kustomize object +func readKustomization(path string) (*types.Kustomization, error) { + data, err := ioutil.ReadFile(path) + if err != nil { + return nil, err + } + def := &types.Kustomization{} + if err = yaml.Unmarshal(data, def); err != nil { + return nil, err + } + return def, nil +} + +func writeKustomization(path string, k *types.Kustomization) error { + yaml, err := yaml.Marshal(k) + + if err != nil { + return errors.WithStack(errors.Wrapf(err, "Error trying to marshal kustomization for path: %v", path)) + } + + kustomizationFileErr := ioutil.WriteFile(path, yaml, 0644) + if kustomizationFileErr != nil { + return errors.WithStack(errors.Wrapf(kustomizationFileErr, "Error writing file: %v", path)) + } + return nil +} + +func main() { + rootDir := ".." + + // Directories to exclude. Thee paths should be relative to rootDir. + // Subdirectories won't be searched + excludes := map[string]bool{ + "tests": true, + ".git": true, + ".github": true, + } + + // These labels are likely to be mutable and should not be part of commonLabels + labelsToRemove := []string{VersionLabel, ManagedByLabel, InstanceLabel, PartOfLabel} + + err := filepath.Walk("..", func(path string, info os.FileInfo, err error) error { + relPath, err := filepath.Rel(rootDir, path) + + if err != nil { + log.Errorf("Could not compute relative path(%v, %v); error: %v", rootDir, path, err) + return err + } + + if _, ok := excludes[relPath]; ok { + log.Infof("Skipping directory %v", path) + return filepath.SkipDir + } + + // skip directories + if info.IsDir() { + return nil + } + + if info.Name() != KustomizationFile { + return nil + } + + k, err := readKustomization(path) + + if err != nil { + log.Errorf("Error reading file: %v; error: %v", path, err) + return nil + } + + if k.CommonLabels == nil { + return nil + } + + modified := false + + for _, l := range labelsToRemove { + if _, ok := k.CommonLabels[l]; ok { + delete(k.CommonLabels, l) + modified = true + } + } + + if !modified { + return nil + } + log.Infof("Writing updated kustomization: %v", path) + + if err := writeKustomization(path, k); err != nil { + log.Errorf("Error writing %v; error: %v", path, err) + } + return nil + }) + + if err != nil { + log.Errorf("error walking the path %v; error: %v", rootDir, err) + + } +} diff --git a/tests/validate_resources_test.go b/tests/validate_resources_test.go new file mode 100644 index 0000000000..5e4f6f298f --- /dev/null +++ b/tests/validate_resources_test.go @@ -0,0 +1,93 @@ +package tests + +import ( + "github.com/ghodss/yaml" + "io/ioutil" + "os" + "path/filepath" + "sigs.k8s.io/kustomize/v3/pkg/types" + "testing" +) + +const ( + VersionLabel = "app.kubernetes.io/version" + InstanceLabel = "app.kubernetes.io/instance" + ManagedByLabel = "app.kubernetes.io/managed-by" + PartOfLabel = "app.kubernetes.io/part-of" + KustomizationFile = "kustomization.yaml" +) + +// readKustomization will read a kustomization.yaml and return the kustomize object +func readKustomization(kfDefFile string) (*types.Kustomization, error) { + data, err := ioutil.ReadFile(kfDefFile) + if err != nil { + return nil, err + } + def := &types.Kustomization{} + if err = yaml.Unmarshal(data, def); err != nil { + return nil, err + } + return def, nil +} + +// TestCommonLabelsImmutable is a test to try to ensure we don't have mutable labels which will +// cause problems on upgrades per https://github.com/kubeflow/manifests/issues/1131. +func TestCommonLabelsImmutable(t *testing.T) { + rootDir := ".." + + // Directories to exclude. Thee paths should be relative to rootDir. + // Subdirectories won't be searched + excludes := map[string]bool{ + "tests": true, + ".git": true, + ".github": true, + } + + // These labels are likely to be mutable and should not be part of commonLabels + forbiddenLabels := []string{VersionLabel, ManagedByLabel, InstanceLabel, PartOfLabel} + + err := filepath.Walk("..", func(path string, info os.FileInfo, err error) error { + relPath, err := filepath.Rel(rootDir, path) + + if err != nil { + t.Fatalf("Could not compute relative path(%v, %v); error: %v", rootDir, path, err) + } + + if _, ok := excludes[relPath]; ok { + t.Logf("Skipping directory %v", path) + return filepath.SkipDir + } + + // skip directories + if info.IsDir() { + return nil + } + + if info.Name() != KustomizationFile { + return nil + } + + k, err := readKustomization(path) + + if err != nil { + t.Errorf("Error reading file: %v; error: %v", path, err) + return nil + } + + if k.CommonLabels == nil { + return nil + } + + for _, l := range forbiddenLabels { + if _, ok := k.CommonLabels[l]; ok { + t.Errorf("%v has forbidden commonLabel %v", path, l) + } + } + return nil + }) + + if err != nil { + t.Errorf("error walking the path %v; error: %v", rootDir, err) + + } +} diff --git a/tf-training/tf-job-crds/overlays/application/kustomization.yaml b/tf-training/tf-job-crds/overlays/application/kustomization.yaml index c41f882c6b..ae51ba2708 100644 --- a/tf-training/tf-job-crds/overlays/application/kustomization.yaml +++ b/tf-training/tf-job-crds/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: tf-job-crds - app.kubernetes.io/instance: tf-job-crds-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: tfjob - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: tf-job-crds +kind: Kustomization +resources: +- application.yaml diff --git a/tf-training/tf-job-operator/overlays/application/kustomization.yaml b/tf-training/tf-job-operator/overlays/application/kustomization.yaml index 414e408c9d..418c718035 100644 --- a/tf-training/tf-job-operator/overlays/application/kustomization.yaml +++ b/tf-training/tf-job-operator/overlays/application/kustomization.yaml @@ -1,13 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: tf-job-operator - app.kubernetes.io/instance: tf-job-operator-v0.7.0 - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: tfjob - app.kubernetes.io/part-of: kubeflow - app.kubernetes.io/version: v0.7.0 + app.kubernetes.io/name: tf-job-operator +kind: Kustomization +resources: +- application.yaml diff --git a/xgboost-job/xgboost-operator/overlays/application/kustomization.yaml b/xgboost-job/xgboost-operator/overlays/application/kustomization.yaml index 1b27a64dc8..cdfc5a7e1d 100644 --- a/xgboost-job/xgboost-operator/overlays/application/kustomization.yaml +++ b/xgboost-job/xgboost-operator/overlays/application/kustomization.yaml @@ -1,12 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization bases: - ../../base -resources: -- application.yaml commonLabels: - app.kubernetes.io/name: xgboost-operator - app.kubernetes.io/instance: xgboost-operator - app.kubernetes.io/managed-by: kfctl app.kubernetes.io/component: xgboostjob - app.kubernetes.io/part-of: kubeflow + app.kubernetes.io/name: xgboost-operator +kind: Kustomization +resources: +- application.yaml