From a12a26c7ceb260d5d1e8df6d09821dd5e8f7629e Mon Sep 17 00:00:00 2001 From: AdheipSingh Date: Mon, 17 Jun 2024 12:58:46 +0530 Subject: [PATCH 1/2] release name optional --- cmd/activate.go | 6 ++++-- hossted/service/activate.go | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/activate.go b/cmd/activate.go index 477d833..463b3d2 100644 --- a/cmd/activate.go +++ b/cmd/activate.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" ) -var activate_type string +var activate_type, releaseName string // registerCmd represents the register command var activateCmd = &cobra.Command{ @@ -28,7 +28,8 @@ hossted activate Run: func(cmd *cobra.Command, args []string) { if activate_type == "k8s" { - err := service.ActivateK8s() + + err := service.ActivateK8s(releaseName) if err != nil { fmt.Println(err) } @@ -56,4 +57,5 @@ hossted activate func init() { rootCmd.AddCommand(activateCmd) activateCmd.Flags().StringVarP(&activate_type, "type", "t", "", "supported env type k8s|docker") + activateCmd.Flags().StringVar(&releaseName, "release_name", "", "release name (optional)") } diff --git a/hossted/service/activate.go b/hossted/service/activate.go index 2c554ac..5cd8d07 100644 --- a/hossted/service/activate.go +++ b/hossted/service/activate.go @@ -62,7 +62,7 @@ type response struct { } // ActivateK8s imports Kubernetes clusters. -func ActivateK8s() error { +func ActivateK8s(releaseName string) error { emailsID, err := getEmail() if err != nil { return err @@ -93,7 +93,7 @@ func ActivateK8s() error { fmt.Println("Your cluster name is ", clusterName) - isStandby, err := isStandbyMode() + isStandby, err := isStandbyMode(releaseName) if err != nil { //return err } @@ -155,10 +155,10 @@ func ActivateK8s() error { return nil } -func isStandbyMode() (bool, error) { +func isStandbyMode(releaseName string) (bool, error) { isStandby := false cr := getDynClient() - hp, err := cr.Resource(hpGVK).Get(context.TODO(), "hossted-operator-cr", metav1.GetOptions{}) + hp, err := cr.Resource(hpGVK).Get(context.TODO(), releaseName+"-cr", metav1.GetOptions{}) if err != nil { return isStandby, err } From 7078293634cabebd53c394624c919fece76848ff Mon Sep 17 00:00:00 2001 From: AdheipSingh Date: Mon, 17 Jun 2024 13:07:07 +0530 Subject: [PATCH 2/2] remove hardocde, releasename --- hossted/service/activate.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hossted/service/activate.go b/hossted/service/activate.go index 5cd8d07..39a68a2 100644 --- a/hossted/service/activate.go +++ b/hossted/service/activate.go @@ -102,7 +102,7 @@ func ActivateK8s(releaseName string) error { fmt.Println("Standby mode detected") clientset := getKubeClient() fmt.Println("Updating deployment....") - err := updateDeployment(clientset, hosstedPlatformNamespace, "hossted-operator-controller-manager", emailsID, clusterName, orgID) + err := updateDeployment(clientset, hosstedPlatformNamespace, releaseName+"-controller-manager", emailsID, clusterName, orgID) if err != nil { return err } @@ -113,7 +113,7 @@ func ActivateK8s(releaseName string) error { } fmt.Println("Updating secret....") - err = updateSecret(clientset, hosstedPlatformNamespace, "hossted-operator-secret", "AUTH_TOKEN", config.Token) + err = updateSecret(clientset, hosstedPlatformNamespace, releaseName+"-secret", "AUTH_TOKEN", config.Token) if err != nil { return err } @@ -132,13 +132,13 @@ func ActivateK8s(releaseName string) error { if monitoringEnabled == "true" || loggingEnabled == "true" || cveEnabled == "true" { fmt.Println("Patching 'hossted-operator-cr' CR") - err = patchCR(monitoringEnabled, loggingEnabled, cveEnabled) + err = patchCR(monitoringEnabled, loggingEnabled, cveEnabled, releaseName) if err != nil { return err } } - err = patchStopCR() + err = patchStopCR(releaseName) if err != nil { return err } @@ -432,9 +432,9 @@ func updateSecret(clientset *kubernetes.Clientset, namespace, secretName, secret return nil } -func patchCR(monitoringEnabled, loggingEnabled, cveEnabled string) error { +func patchCR(monitoringEnabled, loggingEnabled, cveEnabled, releaseName string) error { cr := getDynClient() - hp, err := cr.Resource(hpGVK).Get(context.TODO(), "hossted-operator-cr", metav1.GetOptions{}) + hp, err := cr.Resource(hpGVK).Get(context.TODO(), releaseName+"-cr", metav1.GetOptions{}) if err != nil { return err } @@ -467,9 +467,9 @@ func patchCR(monitoringEnabled, loggingEnabled, cveEnabled string) error { return nil } -func patchStopCR() error { +func patchStopCR(releaseName string) error { cr := getDynClient() - hp, err := cr.Resource(hpGVK).Get(context.TODO(), "hossted-operator-cr", metav1.GetOptions{}) + hp, err := cr.Resource(hpGVK).Get(context.TODO(), releaseName+"-cr", metav1.GetOptions{}) if err != nil { return err }