remove okteto cloud mentions

Signed-off-by: Andrea Falzetti <[email protected]>

cmd/context/context_test.go

@@ -34,18 +34,18 @@ func Test_initFromDeprecatedToken(t *testing.T) {
  }{
  {
  name: "token-create-kubeconfig",
- tokenUrl: "https://cloud.okteto.com",
+ tokenUrl: "https://okteto.example.com",
  kubeconfigCtx: test.KubeconfigFields{
  Name: []string{"test"},
  Namespace: []string{"test"},
- CurrentContext: "cloud_okteto_com",
+ CurrentContext: "okteto_example_com",
  },
  },
  {
  name: "token-token-but-not-in-kubeconfig",
- tokenUrl: "https://cloud.okteto.com",
+ tokenUrl: "https://okteto.example.com",
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: "test",
  },

cmd/context/create_test.go

@@ -62,21 +62,21 @@ func Test_createContext(t *testing.T) {
  name: "change namespace",
  ctxStore: &okteto.ContextStore{
  Contexts: map[string]*okteto.Context{
- "https://okteto.cloud.com": {},
+ "https://okteto.example.com": {},
  },
- CurrentContext: "https://okteto.cloud.com",
+ CurrentContext: "https://okteto.example.com",
  },
  ctxOptions: &Options{
  IsOkteto: true,
  Save: true,
- Context: "https://okteto.cloud.com",
+ Context: "https://okteto-2.example.com",
  Namespace: "test",
  },
  user: &types.User{
  Token: "test",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: ""},
  expectedErr: false,
@@ -85,22 +85,22 @@ func Test_createContext(t *testing.T) {
  name: "change namespace forbidden",
  ctxStore: &okteto.ContextStore{
  Contexts: map[string]*okteto.Context{
- "https://okteto.cloud.com": {},
+ "https://okteto.example.com": {},
  },
- CurrentContext: "https://okteto.cloud.com",
+ CurrentContext: "https://okteto.example.com",
  },
  ctxOptions: &Options{
  IsOkteto: true,
  Save: true,
- Context: "https://okteto.cloud.com",
+ Context: "https://okteto.example.com",
  Namespace: "not-found",
  CheckNamespaceAccess: true,
  },
  user: &types.User{
  Token: "test",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: "",
  },
@@ -110,21 +110,21 @@ func Test_createContext(t *testing.T) {
  name: "change to personal namespace if namespace is not found",
  ctxStore: &okteto.ContextStore{
  Contexts: map[string]*okteto.Context{
- "https://okteto.cloud.com": {},
+ "https://okteto.example.com": {},
  },
- CurrentContext: "https://okteto.cloud.com",
+ CurrentContext: "https://okteto.example.com",
  },
  ctxOptions: &Options{
  IsOkteto: true,
  Save: true,
- Context: "https://okteto.cloud.com",
+ Context: "https://okteto.example.com",
  Namespace: "not-found",
  },
  user: &types.User{
  Token: "test",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: "",
  },
@@ -137,10 +137,10 @@ func Test_createContext(t *testing.T) {
  },
  ctxOptions: &Options{
  IsOkteto: false,
- Context: "cloud_okteto_com",
+ Context: "okteto_example_com",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  },
  user: &types.User{
@@ -168,13 +168,13 @@ func Test_createContext(t *testing.T) {
  },
  ctxOptions: &Options{
  IsOkteto: false,
- Context: "cloud_okteto_com",
+ Context: "okteto_example_com",
  },
  user: &types.User{
  Token: "test",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  },
  expectedErr: false,
@@ -186,13 +186,13 @@ func Test_createContext(t *testing.T) {
  },
  ctxOptions: &Options{
  IsOkteto: false,
- Context: "cloud_okteto_com",
+ Context: "okteto_example_com",
  },
  user: &types.User{
  Token: "test",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  },
  expectedErr: false,
@@ -205,13 +205,13 @@ func Test_createContext(t *testing.T) {
  },
  ctxOptions: &Options{
  IsOkteto: false,
- Context: "cloud_okteto_com",
+ Context: "okteto_example_com",
  },
  user: &types.User{
  Token: "test",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{""},
  },
  expectedErr: false,
@@ -231,10 +231,10 @@ func Test_createContext(t *testing.T) {
  },
  ctxOptions: &Options{
  IsOkteto: false,
- Context: "cloud_okteto_com",
+ Context: "okteto_example_com",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: "",
  },
@@ -259,7 +259,7 @@ func Test_createContext(t *testing.T) {
  },
  kubeconfigCtx: test.KubeconfigFields{
 
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: "",
  },
@@ -283,7 +283,7 @@ func Test_createContext(t *testing.T) {
  Context: "https://cloud.okteto.com",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: "",
  },
@@ -296,14 +296,14 @@ func Test_createContext(t *testing.T) {
  },
  ctxOptions: &Options{
  IsOkteto: true,
- Context: "https://okteto.cloud.com",
+ Context: "https://okteto.example.com",
  Token: "this is a token",
  },
  user: &types.User{
  Token: "test",
  },
  kubeconfigCtx: test.KubeconfigFields{
- Name: []string{"cloud_okteto_com"},
+ Name: []string{"okteto_example_com"},
  Namespace: []string{"test"},
  CurrentContext: "",
  },
@@ -365,7 +365,7 @@ func TestAutoAuthWhenNotValidTokenOnlyWhenOktetoContextIsRun(t *testing.T) {
  name: "okteto context triggers auto auth",
  ctxOptions: &Options{
  IsOkteto: true,
- Context: "https://okteto.cloud.com",
+ Context: "https://okteto.example.com",
  Token: "this is a invalid token",
  IsCtxCommand: true,
  },
@@ -377,7 +377,7 @@ func TestAutoAuthWhenNotValidTokenOnlyWhenOktetoContextIsRun(t *testing.T) {
  name: "non okteto context command gives unauthorized message",
  ctxOptions: &Options{
  IsOkteto: true,
- Context: "https://okteto.cloud.com",
+ Context: "https://okteto.example.com",
  Token: "this is a invalid token",
  IsCtxCommand: false,
  },

cmd/context/list.go

@@ -48,7 +48,7 @@ func List() *cobra.Command {
 }
 
 func executeListContext() error {
- contexts := getOktetoClusters(false)
+ contexts := getOktetoClusters()
  contexts = append(contexts, getK8sClusters(getKubernetesContextList(true))...)
 
  if len(contexts) == 0 {

cmd/context/selector.go

@@ -32,24 +32,21 @@ func getAvailableContexts(ctxOptions *Options) []utils.SelectorItem {
  }
  clusters := make([]utils.SelectorItem, 0)
 
- clusters = append(clusters, getOktetoClusters(true)...)
+ clusters = append(clusters, getOktetoClusters()...)
  if len(k8sClusters) > 0 {
  clusters = append(clusters, getK8sClusters(k8sClusters)...)
  }
 
  return clusters
 }
 
-func getOktetoClusters(skipCloud bool) []utils.SelectorItem {
+func getOktetoClusters() []utils.SelectorItem {
  orderedOktetoClusters := make([]utils.SelectorItem, 0)
  ctxStore := okteto.GetContextStore()
  for ctxName, okCtx := range ctxStore.Contexts {
  if !okCtx.IsOkteto {
  continue
  }
- if skipCloud && ctxName == okteto.CloudURL {
- continue
- }
  orderedOktetoClusters = append(
  orderedOktetoClusters,
  utils.SelectorItem{
@@ -59,12 +56,6 @@ func getOktetoClusters(skipCloud bool) []utils.SelectorItem {
  })
  }
  sort.Slice(orderedOktetoClusters, func(i, j int) bool {
- if orderedOktetoClusters[i].Name == okteto.CloudURL {
- return true
- }
- if orderedOktetoClusters[j].Name == okteto.CloudURL {
- return false
- }
  return strings.Compare(orderedOktetoClusters[i].Name, orderedOktetoClusters[j].Name) < 0
  })
  return orderedOktetoClusters

cmd/context/use.go

@@ -57,7 +57,7 @@ This will prompt you to select one of your existing contexts or to create a new
 
 You can also specify an Okteto URL:
 
- $ okteto context use https://cloud.okteto.com
+ $ okteto context use https://okteto.example.com
 
 Or a Kubernetes context:
 
@@ -209,7 +209,7 @@ func getContext(ctxOptions *Options) (string, error) {
  }
  if isCreateNewContextOption(oktetoContext) {
  ctxStore := okteto.GetContextStore()
- clusterURL := okteto.CloudURL
+ clusterURL := ""
  if oCtx, ok := ctxStore.Contexts[ctxStore.CurrentContext]; ok && oCtx.IsOkteto {
  clusterURL = ctxStore.CurrentContext
  }

cmd/up/up.go

@@ -154,10 +154,6 @@ func Up(at analyticsTrackerInterface, insights buildDeployTrackerInterface, ioCt
  manifestOpts := contextCMD.ManifestOptions{Filename: upOptions.ManifestPath, Namespace: upOptions.Namespace, K8sContext: upOptions.K8sContext}
  oktetoManifest, err := contextCMD.LoadManifestWithContext(ctx, manifestOpts, afero.NewOsFs())
  if err != nil {
- if err.Error() == fmt.Errorf(oktetoErrors.ErrNotLogged, okteto.CloudURL).Error() {
- return err
- }
-
  if !errors.Is(err, discovery.ErrOktetoManifestNotFound) {
  return err
  }

integration/actions/actions_test.go

@@ -36,7 +36,7 @@ var (
  oktetoVersion = ""
  user = ""
  kubectlBinary = "kubectl"
- appsSubdomain = "cloud.okteto.net"
+ appsSubdomain = ""
 )
 
 func TestMain(m *testing.M) {

integration/actions/context_test.go

@@ -70,9 +70,6 @@ func executeContextAction() error {
  defer integration.DeleteGitRepo(actionFolder)
 
  oktetoURL := os.Getenv(model.OktetoURLEnvVar)
- if oktetoURL == "" {
- oktetoURL = okteto.CloudURL
- }
  log.Printf("login into %s", oktetoURL)
  command := fmt.Sprintf("%s/entrypoint.sh", actionFolder)
  args := []string{token, oktetoURL}

integration/actions/login_test.go

@@ -66,9 +66,6 @@ func executeLoginAction() error {
  defer integration.DeleteGitRepo(actionFolder)
 
  oktetoURL := os.Getenv(model.OktetoURLEnvVar)
- if oktetoURL == "" {
- oktetoURL = okteto.CloudURL
- }
  log.Printf("login into %s", oktetoURL)
  command := fmt.Sprintf("%s/entrypoint.sh", actionFolder)
  args := []string{token, oktetoURL}

integration/build/build_test.go

@@ -36,7 +36,7 @@ import (
 var (
  user = ""
  kubectlBinary = "kubectl"
- appsSubdomain = "cloud.okteto.net"
+ appsSubdomain = ""
  token = ""
 )
 

integration/deploy/deploy_test.go

@@ -31,7 +31,7 @@ import (
 var (
  user = ""
  kubectlBinary = "kubectl"
- appsSubdomain = "cloud.okteto.net"
+ appsSubdomain = ""
  token = ""
 )
 

integration/deprecated/push/push_test.go

@@ -39,7 +39,7 @@ var (
  user = ""
  token = ""
  kubectlBinary = "kubectl"
- appsSubdomain = "cloud.okteto.net"
+ appsSubdomain = ""
 )
 
 const (

integration/deprecated/stack/stack_test.go

@@ -33,7 +33,7 @@ var (
  user = ""
  token = ""
  kubectlBinary = "kubectl"
- appsSubdomain = "cloud.okteto.net"
+ appsSubdomain = ""
 )
 
 func TestMain(m *testing.M) {

integration/okteto/okteto_test.go

@@ -30,7 +30,7 @@ import (
 var (
  user = ""
  kubectlBinary = "kubectl"
- appsSubdomain = "cloud.okteto.net"
+ appsSubdomain = ""
  token = ""
 )
 

integration/up/up_test.go

@@ -37,7 +37,7 @@ var (
  user = ""
  token = ""
  kubectlBinary = "kubectl"
- appsSubdomain = "cloud.okteto.net"
+ appsSubdomain = ""
  ErrUpNotRunning = errors.New("Up command is no longer running")
 )