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

Enable oc token generation for ROKS satellite #324

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable oc token generation for ROKS satellite #324

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
4 changes: 2 additions & 2 deletions api/container/containerv2/clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ func (r *clusters) GetClusterConfigDetail(name, dir string, admin bool, target C
clusterkey.FilePath, _ = filepath.Abs(kubeyml)
return clusterkey, err
}
if clusterInfo.Type == "openshift" && clusterInfo.Provider != "satellite" {
if clusterInfo.Type == "openshift" && clusterInfo.Provider == "satellite" {
trace.Logger.Println("Debug: type is openshift trying login to get token")
var yamlConfig []byte
if yamlConfig, err = ioutil.ReadFile(kubeyml); err != nil {
Expand Down Expand Up @@ -500,7 +500,7 @@ func (r *clusters) StoreConfigDetail(name, dir string, admin, createCalicoConfig
return calicoConfig, clusterkey, nil
}

if clusterInfo.Type == "openshift" && clusterInfo.Provider != "satellite" {
if clusterInfo.Type == "openshift" && clusterInfo.Provider == "satellite" {
trace.Logger.Println("Cluster Type is openshift trying login to get token")
var yamlConfig []byte
if yamlConfig, err = ioutil.ReadFile(kubeconfigFileName); err != nil {
Expand Down