Skip to content

release name optional #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AdheipSingh merged 2 commits into from
Jun 17, 2024
Merged

release name optional #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12a26c
release name optional
AdheipSingh Jun 17, 2024
7078293
remove hardocde, releasename
AdheipSingh Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmd/activate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)")
}
24 changes: 12 additions & 12 deletions hossted/service/activate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand All @@ -102,7 +102,7 @@ func ActivateK8s() 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
}
Expand All @@ -113,7 +113,7 @@ func ActivateK8s() 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
}
Expand All @@ -132,13 +132,13 @@ func ActivateK8s() 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
}
Expand All @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down