Make the KFDef stacks example non GCP specifc. (kubeflow#1238)

* For GCP will not be using KFDef with 1.1; instead we will be using
  blueprints (see kubeflow#1063)

* Therefore I updated the existing example of deploying using stacks
  to make it non GCP specific so that it could be used as an example
  for platforms that still want to use KFDef.

  * kubeflow#1062 is tracking migrating all KFDefs to the new versions
    of our kustomize packages

stacks/examples/alice_gcp/kubeflow-config.yaml → stacks/examples/alice/kubeflow-config.yaml

@@ -7,7 +7,6 @@ metadata:
   # config map.
   name: kubeflow-config
 data:
-  # For GCP we can use these to define GCP
-  # parameters that should be common across applications
+  # Examples of overriding config.
   project: alice-gcp
   zone: us-east1-d

stacks/examples/alice_gcp/kustomization.yaml → stacks/examples/alice/kustomization.yaml

@@ -7,7 +7,7 @@ generatorOptions:
   disableNameSuffixHash: true
 resources:
 # Users start by inheriting the gcp stack and then customizing it
-- ../../gcp
+- ../../generic
 patchesStrategicMerge:
 # Patch in modifications to the global config
 - kubeflow-config.yaml

stacks/examples/kfctl_gcp_stacks.experimental.yaml → stacks/examples/kfdef_stacks.experimental.yaml

@@ -5,15 +5,8 @@ metadata:
   namespace: kubeflow
 spec:
   applications:
-  # One of the primary reasons for splitting out packages into separate kustomize
-  # directories is when the resources needed to be installed in a different namespace.  
-  # TODO(jlewi): This should be replaced by ACM when its ready.
-  # Its a separate package because it needs to be in a different namespace
-  - kustomizeConfig:
-      repoRef:
-        name: manifests
-        path: istio/gcp-1-1-6
-    name: istio-stack
+  # TODO: If you actually want to install ISTIO as part of KFDef setup you would
+  # need to add the appropriate package.
   # Create Kubeflow specific ISTIO resources.
   - kustomizeConfig:
       repoRef:
@@ -32,17 +25,6 @@ spec:
         name: manifests
         path: application/v3
     name: application
-  # Install GCP ingress related packages
-  - kustomizeConfig:
-      repoRef:
-        name: manifests
-        path: gcp/cloud-endpoints/overlays/application
-    name: cloud-endpoints
-  - kustomizeConfig:
-      repoRef:
-        name: manifests
-        path: gcp/iap-ingress/v3
-    name: iap-ingress
   # Certmanager gets installed in a different namespace so it needs to be a separate package
   - kustomizeConfig:
       repoRef:
@@ -63,7 +45,7 @@ spec:
   - kustomizeConfig:
       repoRef:
         name: manifests
-        path: stacks/gcp
+        path: stacks/generic
     name: kubeflow-apps
   # Spartakus is a separate applications so that kfctl can remove it
   # to disable usage reporting
@@ -72,23 +54,7 @@ spec:
         name: manifests
         path: common/spartakus/overlays/application
     name: spartakus
-  plugins:
-  # TODO(jlewi): The plugin is currently commented out because we don't want to run the
-  # generate logic
-  - kind: KfGcpPlugin
-    metadata:
-      creationTimestamp: null
-      name: gcp
-    spec:
-      createPipelinePersistentStorage: true
-      deploymentManagerConfig:
-        repoRef:
-          name: manifests
-          path: gcp/deployment_manager_configs
-      enableWorkloadIdentity: true
-      skipInitProject: true
-      useBasicAuth: false
   repos:
   - name: manifests
-    uri: https://github.com/jlewi/manifests/archive/stacks.tar.gz    
+    uri: https://github.com/kubeflow/manifests/archive/master.tar.gz    
   version: master

stacks/gcp/kustomization.yaml → stacks/generic/kustomization.yaml

@@ -7,7 +7,6 @@ resources:
   # We need to switch the admission webhook to use cert-manager.
   - ../../admission-webhook/webhook/v3
   - ../../common/centraldashboard/overlays/stacks
-  - ../../gcp/gpu-driver/overlays/application/
   - ../../kubeflow-roles/base
   - ../../jupyter/jupyter-web-app/base_v3
   - ../../jupyter/notebook-controller/base_v3

tests/stacks/examples/alice_gcp/kustomize_test.go → tests/stacks/examples/alice/kustomize_test.go

@@ -1,4 +1,4 @@
-package alice_gcp
+package alice
 
 import (
 	"github.com/kubeflow/manifests/tests"
@@ -7,7 +7,7 @@ import (
 
 func TestKustomize(t *testing.T) {
 	testCase := &tests.KustomizeTestCase{
-		Package:  "../../../../stacks/examples/alice_gcp",
+		Package:  "../../../../stacks/examples/alice",
 		Expected: "test_data/expected",
 	}
 

tests/stacks/gcp/kustomize_test.go → tests/stacks/generic/kustomize_test.go

@@ -1,4 +1,4 @@
-package gcp
+package generic
 
 import (
 	"github.com/kubeflow/manifests/tests"
@@ -7,7 +7,7 @@ import (
 
 func TestKustomize(t *testing.T) {
 	testCase := &tests.KustomizeTestCase{
-		Package:  "../../../stacks/gcp",
+		Package:  "../../../stacks/generic",
 		Expected: "test_data/expected",
 	}