Skip to content
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

[2.8] Updated const for corral-packge conflict on naming #339

Open
wants to merge 1 commit into
base: release/v2.8
Choose a base branch
from
Open

[2.8] Updated const for corral-packge conflict on naming #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions clients/corral/corral.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
)

const (
debugFlag = "--debug"
skipCleanupFlag = "--skip-cleanup"
corralPrivateSSHKey = "corral_private_key"
corralPublicSSHKey = "corral_public_key"
corralRegistryIP = "registry_ip"
corralRegistryPrivateIP = "registry_private_ip"
debugFlag = "--debug"
skipCleanupFlag = "--skip-cleanup"
corralPrivateSSHKey = "corral_private_key"
corralPublicSSHKey = "corral_public_key"
corralBastionIP = "bastion_ip"
corralBastionPrivateIP = "bastion_private_ip"
)

// GetCorralEnvVar gets corral environment variables
Expand Down Expand Up @@ -358,20 +358,20 @@ func SetCorralSSHKeys(corralName string) error {

// SetCorralBastion is a helper function that will set the corral bastion private and pulic addresses previously generated by `corralName`
func SetCorralBastion(corralName string) error {
bastion_ip, err := GetCorralEnvVar(corralName, corralRegistryIP)
bastion_ip, err := GetCorralEnvVar(corralName, corralBastionIP)
if err != nil {
return err
}

err = UpdateCorralConfig(corralRegistryIP, bastion_ip)
err = UpdateCorralConfig(corralBastionIP, bastion_ip)
if err != nil {
return err
}

bastion_internal_ip, err := GetCorralEnvVar(corralName, corralRegistryPrivateIP)
bastion_internal_ip, err := GetCorralEnvVar(corralName, corralBastionPrivateIP)
if err != nil {
return err
}

return UpdateCorralConfig(corralRegistryPrivateIP, bastion_internal_ip)
return UpdateCorralConfig(corralBastionPrivateIP, bastion_internal_ip)
}
Loading