const up issuer file names

linkerd · Mar 29, 2019 · 292f1da · 292f1da
1 parent c4383da
commit 292f1da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/cli/cmd/upgrade.go b/cli/cmd/upgrade.go
@@ -172,13 +172,13 @@ func fetchIssuer(k *kubernetes.Clientset, trustPEM string) (string, string, time
 		return "", "", time.Time{}, err
 	}
 
-	keyPEM := string(secret.Data["key.pem"])
+	keyPEM := string(secret.Data[k8s.IdentityIssuerKeyName])
 	key, err := tls.DecodePEMKey(keyPEM)
 	if err != nil {
 		return "", "", time.Time{}, err
 	}
 
-	crtPEM := string(secret.Data["crt.pem"])
+	crtPEM := string(secret.Data[k8s.IdentityIssuerCrtName])
 	crt, err := tls.DecodePEMCrt(crtPEM)
 	if err != nil {
 		return "", "", time.Time{}, err

diff --git a/pkg/k8s/labels.go b/pkg/k8s/labels.go
@@ -173,10 +173,15 @@ const (
 	// volume mounted into each proxy to store identity credentials.
 	IdentityEndEntityVolumeName = "linkerd-identity-end-entity"
 
-	// IdentityIssuerSecretName is the name assigned the temporary end-entity
-	// volume mounted into each proxy to store identity credentials.
+	// IdentityIssuerSecretName is the name of the Secret that stores issuer credentials.
 	IdentityIssuerSecretName = "linkerd-identity-issuer"
 
+	// IdentityIssuerKeyName is the issuer's private key file.
+	IdentityIssuerKeyName = "key.pem"
+
+	// IdentityIssuerKeyName is the issuer's certificate file.
+	IdentityIssuerCrtName = "crt.pem"
+
 	// ProxyPortName is the name of the Linkerd Proxy's proxy port.
 	ProxyPortName = "linkerd-proxy"