Lookup the dynamic configmap name instead of 'replicated' (#88)

* Lookup the dynamic configmap name instead of 'replicated'
replicatedhq · Sep 7, 2023 · bbcd099 · bbcd099
1 parent 1e3010b
commit bbcd099
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -70,10 +70,6 @@ Is OpenShift
 {{/*
 Resource Names
 */}}
-{{- define "replicated.configMapName" -}}
-  {{ include "replicated.name" . }}
-{{- end -}}
-
 {{- define "replicated.deploymentName" -}}
   {{ include "replicated.name" . }}
 {{- end -}}

diff --git a/chart/templates/replicated-configmap.yaml b/chart/templates/replicated-configmap.yaml
@@ -1,17 +1,17 @@
 {{/*
 This is a legacy/deprecated configmap.
-The replicated API will use the deployment uid as the app-id and replicated-id if the configmap does not exist.
+The replicated API will use the deployment uid if the configmap does not exist.
 */}}
-{{- $data := (lookup "v1" "ConfigMap" .Release.Namespace "replicated").data }}
+{{- $data := (lookup "v1" "ConfigMap" .Release.Namespace "replicated-sdk").data }}
 {{- if $data }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
     {{- include "replicated.labels" . | nindent 4 }}
-  name: {{ include "replicated.configMapName" . }}
+  name: replicated-sdk
   namespace: {{ include "replicated.namespace" . | quote }}
 data:
-  replicated-id: {{ index $data "replicated-id" }}
+  replicated-sdk-id: {{ index $data "replicated-sdk-id" }}
   app-id: {{ index $data "app-id" }}
 {{- end }}
diff --git a/chart/templates/replicated-deployment.yaml b/chart/templates/replicated-deployment.yaml
@@ -67,8 +67,6 @@ spec:
           value: secret # TODO: support other drivers
         - name: REPLICATED_SECRET_NAME
           value: {{ include "replicated.secretName" . }}
-        - name: REPLICATED_CONFIGMAP_NAME
-          value: {{ include "replicated.configMapName" . }}
         - name: REPLICATED_DEPLOYMENT_NAME
           value: {{ include "replicated.deploymentName" . }}
         - name: REPLICATED_CONFIG_FILE

diff --git a/pkg/util/replicated.go b/pkg/util/replicated.go
@@ -18,20 +18,17 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+func GetLegacyReplicatedConfigMapName() string {
+	return "replicated-sdk"
+}
+
 func GetReplicatedSecretName() string {
 	if sn := os.Getenv("REPLICATED_SECRET_NAME"); sn != "" {
 		return sn
 	}
 	return "replicated"
 }
 
-func GetReplicatedConfigMapName() string {
-	if cmn := os.Getenv("REPLICATED_CONFIGMAP_NAME"); cmn != "" {
-		return cmn
-	}
-	return "replicated"
-}
-
 func GetReplicatedDeploymentName() string {
 	if dn := os.Getenv("REPLICATED_DEPLOYMENT_NAME"); dn != "" {
 		return dn
@@ -45,9 +42,9 @@ func GetReplicatedAndAppIDs(namespace string) (string, string, error) {
 		return "", "", errors.Wrap(err, "failed to get clientset")
 	}
 
-	cm, err := clientset.CoreV1().ConfigMaps(namespace).Get(context.TODO(), GetReplicatedConfigMapName(), metav1.GetOptions{})
+	cm, err := clientset.CoreV1().ConfigMaps(namespace).Get(context.TODO(), GetLegacyReplicatedConfigMapName(), metav1.GetOptions{})
 	if err != nil && !kuberneteserrors.IsNotFound(err) {
-		return "", "", errors.Wrap(err, "failed to get replicated configmap")
+		return "", "", errors.Wrap(err, "failed to get replicated-sdk configmap")
 	}
 
 	replicatedID := ""
@@ -61,7 +58,7 @@ func GetReplicatedAndAppIDs(namespace string) (string, string, error) {
 		replicatedID = string(d.ObjectMeta.UID)
 		appID = string(d.ObjectMeta.UID)
 	} else {
-		replicatedID = cm.Data["replicated-id"]
+		replicatedID = cm.Data["replicated-sdk-id"]
 		appID = cm.Data["app-id"]
 	}