linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 'linkerd install' current installs detection (#5783) 

Fixes #5782

`linkerd install` was checking for the existence of the
`linkerd-config-overrides` secret which hasn't been available till
recent versions. Changed this to check for the usual `linkerd-config`
ConfigMap. Uses a straight k8s API call for simplicity.
This commit is contained in:
Alejandro Pedraza 2021-02-22 10:00:55 -05:00 committed by GitHub
parent 9d0b61b1c2
commit c55f37411a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/cmd/install.go
View File

@ -285,15 +285,16 @@ func install(ctx context.Context, w io.Writer, values *l5dcharts.Values, flags [
if err != nil {
return err
}
stored, err := loadStoredValues(ctx, k8sAPI)
if err != nil {
return err
}
if stored != nil {
fmt.Fprintf(os.Stderr, errMsgLinkerdConfigResourceConflict, controlPlaneNamespace, "Secret/linkerd-config-overrides already exists")
// We just want to check if `linkerd-configmap` exists
_, err := k8sAPI.CoreV1().ConfigMaps(controlPlaneNamespace).Get(ctx, k8s.ConfigConfigMapName, metav1.GetOptions{})
if err == nil {
fmt.Fprintf(os.Stderr, errMsgLinkerdConfigResourceConflict, controlPlaneNamespace, "ConfigMap/linkerd-config already exists")
os.Exit(1)
}
if !kerrors.IsNotFound(err) {
return err
}
}
err = initializeIssuerCredentials(ctx, k8sAPI, values)