diff --git a/providers/akamai/create.go b/providers/akamai/create.go index 7ed4a74a..5f8b5bc3 100644 --- a/providers/akamai/create.go +++ b/providers/akamai/create.go @@ -253,25 +253,25 @@ func CreateAkamaiCluster(definition *pkgtypes.ClusterDefinition) error { } if ctrl.InstallKubefirstPro { - log.Info().Msg("waiting for kubefirst-api Deployment to transition to Running") - kubefirstAPI, err := k8s.ReturnDeploymentObject( + log.Info().Msg("waiting for kubefirst-pro-api Deployment to transition to Running") + kubefirstProAPI, err := k8s.ReturnDeploymentObject( kcfg.Clientset, "app.kubernetes.io/name", - "kubefirst-api", + "kubefirst-pro-api", "kubefirst", 1200, ) if err != nil { - log.Error().Msgf("error finding kubefirst api Deployment: %s", err) + log.Error().Msgf("error finding kubefirst-pro-api Deployment: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error finding kubefirst api Deployment: %w", err) + return fmt.Errorf("error finding kubefirst-pro-api Deployment: %w", err) } - _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstAPI, 300) + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstProAPI, 300) if err != nil { - log.Error().Msgf("error waiting for kubefirst-api to transition to Running: %s", err) + log.Error().Msgf("error waiting for kubefirst-pro-api to transition to Running: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error waiting for kubefirst-api to transition to Running: %w", err) + return fmt.Errorf("error waiting for kubefirst-pro-api to transition to Running: %w", err) } } diff --git a/providers/aws/create.go b/providers/aws/create.go index 96a4b27a..49b531b7 100644 --- a/providers/aws/create.go +++ b/providers/aws/create.go @@ -247,23 +247,23 @@ func CreateAWSCluster(definition *pkgtypes.ClusterDefinition) error { } if ctrl.InstallKubefirstPro { - log.Info().Msg("waiting for kubefirst-api Deployment to transition to Running") - kubefirstAPI, err := k8s.ReturnDeploymentObject( + log.Info().Msg("waiting for kubefirst-pro-api Deployment to transition to Running") + kubefirstProAPI, err := k8s.ReturnDeploymentObject( ctrl.Kcfg.Clientset, "app.kubernetes.io/name", - "kubefirst-api", + "kubefirst-pro-api", "kubefirst", 1200, ) if err != nil { ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error finding kubefirst-api Deployment: %w", err) + return fmt.Errorf("error finding kubefirst-pro-api Deployment: %w", err) } - _, err = k8s.WaitForDeploymentReady(ctrl.Kcfg.Clientset, kubefirstAPI, 300) + _, err = k8s.WaitForDeploymentReady(ctrl.Kcfg.Clientset, kubefirstProAPI, 300) if err != nil { ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error waiting for kubefirst-api deployment to enter Ready state: %w", err) + return fmt.Errorf("error waiting for kubefirst-pro-api deployment to enter Ready state: %w", err) } } diff --git a/providers/civo/create.go b/providers/civo/create.go index 1ff96787..46b35859 100644 --- a/providers/civo/create.go +++ b/providers/civo/create.go @@ -241,25 +241,25 @@ func CreateCivoCluster(definition *pkgtypes.ClusterDefinition) error { } if ctrl.InstallKubefirstPro { - log.Info().Msg("waiting for kubefirst-api Deployment to transition to Running") - kubefirstAPI, err := k8s.ReturnDeploymentObject( + log.Info().Msg("waiting for kubefirst-pro-api Deployment to transition to Running") + kubefirstProAPI, err := k8s.ReturnDeploymentObject( kcfg.Clientset, "app.kubernetes.io/name", - "kubefirst-api", + "kubefirst-pro-api", "kubefirst", 1200, ) if err != nil { - log.Error().Msgf("Error finding kubefirst api Deployment: %s", err) + log.Error().Msgf("Error finding kubefirst-pro-api Deployment: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error finding kubefirst api Deployment: %w", err) + return fmt.Errorf("error finding kubefirst-pro-api Deployment: %w", err) } - _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstAPI, 300) + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstProAPI, 300) if err != nil { - log.Error().Msgf("Error waiting for kubefirst-api to transition to Running: %s", err) + log.Error().Msgf("Error waiting for kubefirst-pro-api to transition to Running: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error waiting for kubefirst-api to transition to Running: %w", err) + return fmt.Errorf("error waiting for kubefirst-pro-api to transition to Running: %w", err) } } diff --git a/providers/digitalocean/create.go b/providers/digitalocean/create.go index 26658260..6e4eb69a 100644 --- a/providers/digitalocean/create.go +++ b/providers/digitalocean/create.go @@ -235,25 +235,25 @@ func CreateDigitaloceanCluster(definition *pkgtypes.ClusterDefinition) error { } if ctrl.InstallKubefirstPro { - log.Info().Msg("waiting for kubefirst-api Deployment to transition to Running") - kubefirstAPI, err := k8s.ReturnDeploymentObject( + log.Info().Msg("waiting for kubefirst-pro-api Deployment to transition to Running") + kubefirstProAPI, err := k8s.ReturnDeploymentObject( kcfg.Clientset, "app.kubernetes.io/name", - "kubefirst-api", + "kubefirst-pro-api", "kubefirst", 1200, ) if err != nil { - log.Error().Msgf("Error finding kubefirst api Deployment: %s", err) + log.Error().Msgf("Error finding kubefirst-pro-api Deployment: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error finding kubefirst api Deployment: %w", err) + return fmt.Errorf("error finding kubefirst-pro-api Deployment: %w", err) } - _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstAPI, 300) + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstProAPI, 300) if err != nil { - log.Error().Msgf("Error waiting for kubefirst-api to transition to Running: %s", err) + log.Error().Msgf("Error waiting for kubefirst-pro-api to transition to Running: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error waiting for kubefirst-api to transition to Running: %w", err) + return fmt.Errorf("error waiting for kubefirst-pro-api to transition to Running: %w", err) } } diff --git a/providers/google/create.go b/providers/google/create.go index d9f86d1c..5b27e822 100644 --- a/providers/google/create.go +++ b/providers/google/create.go @@ -266,25 +266,25 @@ func CreateGoogleCluster(definition *pkgtypes.ClusterDefinition) error { } if ctrl.InstallKubefirstPro { - log.Info().Msg("waiting for kubefirst-api Deployment to transition to Running") - kubefirstAPI, err := k8s.ReturnDeploymentObject( + log.Info().Msg("waiting for kubefirst-pro-api Deployment to transition to Running") + kubefirstProAPI, err := k8s.ReturnDeploymentObject( kcfg.Clientset, "app.kubernetes.io/name", - "kubefirst-api", + "kubefirst-pro-api", "kubefirst", 1200, ) if err != nil { - log.Error().Msgf("Error finding kubefirst api Deployment: %s", err) + log.Error().Msgf("Error finding kubefirst-pro-api Deployment: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error finding kubefirst-api deployment: %w", err) + return fmt.Errorf("error finding kubefirst-pro-api deployment: %w", err) } - _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstAPI, 300) + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstProAPI, 300) if err != nil { - log.Error().Msgf("Error waiting for kubefirst-api to transition to Running: %s", err) + log.Error().Msgf("Error waiting for kubefirst-pro-api to transition to Running: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error waiting for kubefirst-api deployment to be ready: %w", err) + return fmt.Errorf("error waiting for kubefirst-pro-api deployment to be ready: %w", err) } } diff --git a/providers/k3s/create.go b/providers/k3s/create.go index aa890e77..1988716f 100644 --- a/providers/k3s/create.go +++ b/providers/k3s/create.go @@ -243,25 +243,25 @@ func CreateK3sCluster(definition *pkgtypes.ClusterDefinition) error { } if ctrl.InstallKubefirstPro { - log.Info().Msg("waiting for kubefirst-api Deployment to transition to Running") - kubefirstAPI, err := k8s.ReturnDeploymentObject( + log.Info().Msg("waiting for kubefirst-pro-api Deployment to transition to Running") + kubefirstProAPI, err := k8s.ReturnDeploymentObject( kcfg.Clientset, "app.kubernetes.io/name", - "kubefirst-api", + "kubefirst-pro-api", "kubefirst", 1200, ) if err != nil { - log.Error().Msgf("Error finding kubefirst api Deployment: %s", err) + log.Error().Msgf("Error finding kubefirst-pro-api Deployment: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error finding kubefirst api Deployment: %w", err) + return fmt.Errorf("error finding kubefirst-pro-api Deployment: %w", err) } - _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstAPI, 300) + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstProAPI, 300) if err != nil { - log.Error().Msgf("Error waiting for kubefirst-api to transition to Running: %s", err) + log.Error().Msgf("Error waiting for kubefirst-pro-api to transition to Running: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error waiting for kubefirst-api to transition to Running: %w", err) + return fmt.Errorf("error waiting for kubefirst-pro-api to transition to Running: %w", err) } } diff --git a/providers/vultr/create.go b/providers/vultr/create.go index cbf8eaae..5742d928 100644 --- a/providers/vultr/create.go +++ b/providers/vultr/create.go @@ -242,26 +242,26 @@ func CreateVultrCluster(definition *pkgtypes.ClusterDefinition) error { } if ctrl.InstallKubefirstPro { - log.Info().Msg("waiting for kubefirst-api Deployment to transition to Running") - kubefirstAPI, err := k8s.ReturnDeploymentObject( + log.Info().Msg("waiting for kubefirst-pro-api Deployment to transition to Running") + kubefirstProAPI, err := k8s.ReturnDeploymentObject( kcfg.Clientset, "app.kubernetes.io/name", - "kubefirst-api", + "kubefirst-pro-api", "kubefirst", 1200, ) if err != nil { - log.Error().Msgf("Error finding kubefirst api Deployment: %s", err) + log.Error().Msgf("Error finding kubefirst-pro-api Deployment: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error finding kubefirst api Deployment: %w", err) + return fmt.Errorf("error finding kubefirst-pro-api Deployment: %w", err) } - _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstAPI, 300) + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstProAPI, 300) if err != nil { - log.Error().Msgf("Error waiting for kubefirst-api to transition to Running: %s", err) + log.Error().Msgf("Error waiting for kubefirst-pro-api to transition to Running: %s", err) ctrl.UpdateClusterOnError(err.Error()) - return fmt.Errorf("error waiting for kubefirst-api to transition to Running: %w", err) + return fmt.Errorf("error waiting for kubefirst-pro-api to transition to Running: %w", err) } }