From 94c35cfa53235961a329cefd144ecf524fe5cea4 Mon Sep 17 00:00:00 2001 From: Richard Liu <39319471+richardsliu@users.noreply.github.com> Date: Fri, 14 Feb 2020 12:49:28 -0800 Subject: [PATCH] Update config file names (#238) --- cmd/kfctl/cmd/apply.go | 10 +++++----- cmd/kfctl/cmd/build.go | 2 +- pkg/kfapp/kustomize/kustomize.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/kfctl/cmd/apply.go b/cmd/kfctl/cmd/apply.go index f102d5df..66b42bdb 100644 --- a/cmd/kfctl/cmd/apply.go +++ b/cmd/kfctl/cmd/apply.go @@ -32,10 +32,10 @@ var err error // KFDef example configs to be printed out from apply --help const ( - arritkoConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v0.7-branch/kfdef/kfctl_existing_arrikto.0.7.0.yaml" - awsConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v0.7-branch/kfdef/kfctl_aws.0.7.0.yaml" - gcpConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v0.7-branch/kfdef/kfctl_gcp_iap.0.7.0.yaml" - k8sConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v0.7-branch/kfdef/kfctl_k8s_istio.0.7.0.yaml" + awsConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v1.0-branch/kfdef/kfctl_aws.v1.0.0.yaml" + gcpConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v1.0-branch/kfdef/kfctl_gcp_iap.v1.0.0.yaml" + istioDexConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v1.0-branch/kfdef/kfctl_istio_dex.v1.0.0.yaml" + k8sConfig = "https://raw.githubusercontent.com/kubeflow/manifests/v1.0-branch/kfdef/kfctl_k8s_istio.v1.0.0.yaml" ) // applyCmd represents the apply command @@ -100,7 +100,7 @@ func init() { export CONFIG=./kfctl_gcp_iap.yaml or a URL: export CONFIG=`+gcpConfig+` - export CONFIG=`+arritkoConfig+` + export CONFIG=`+istioDexConfig+` export CONFIG=`+awsConfig+` export CONFIG=`+k8sConfig+` kfctl apply -V --file=${CONFIG}`) diff --git a/cmd/kfctl/cmd/build.go b/cmd/kfctl/cmd/build.go index 4611b328..746c222b 100644 --- a/cmd/kfctl/cmd/build.go +++ b/cmd/kfctl/cmd/build.go @@ -81,7 +81,7 @@ func init() { export CONFIG=./kfctl_gcp_iap.yaml or a URL: export CONFIG=`+gcpConfig+` - export CONFIG=`+arritkoConfig+` + export CONFIG=`+istioDexConfig+` export CONFIG=`+awsConfig+` export CONFIG=`+k8sConfig+` kfctl build -V --file=${CONFIG}`) diff --git a/pkg/kfapp/kustomize/kustomize.go b/pkg/kfapp/kustomize/kustomize.go index 1bce091c..f1a06534 100644 --- a/pkg/kfapp/kustomize/kustomize.go +++ b/pkg/kfapp/kustomize/kustomize.go @@ -186,7 +186,7 @@ func (kustomize *kustomize) Apply(resources kftypesv3.ResourceEnum) error { Message: fmt.Sprintf("can not encode component %v as yaml Error %v", app.Name, err), } } - + // TODO(https://github.com/kubeflow/manifests/issues/806): Bump the timeout because cert-manager takes // a long time to start. Any application that needs to create a certificate will fail because it won't // be able to create certificates if cert-manager is unavailable. We should try to identify Permanent Errors