add clusterID and instanceID params

replicatedhq · Sep 8, 2023 · b27734c · b27734c
1 parent 741aff7
commit b27734c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/chart/templates/replicated-secret.yaml b/chart/templates/replicated-secret.yaml
@@ -30,6 +30,8 @@ stringData:
       {{- .Values.statusInformers | toYaml | nindent 6 }}
     {{- end }}
     managedBy: {{ .Values.managedBy | default "Helm" | quote }}
+    clusterID: {{ .Values.clusterID | default "" | quote }}
+    instanceID: {{ .Values.instanceID | default "" | quote }}
   {{- if (.Values.integration).licenseID }}
   integration-license-id: {{ .Values.integration.licenseID }}
   {{- end }}

diff --git a/chart/values.yaml.tmpl b/chart/values.yaml.tmpl
@@ -50,3 +50,5 @@ integration:
   mockData: ""
 
 managedBy: Helm
+clusterID: ""
+instanceID: ""
diff --git a/cmd/replicated/api.go b/cmd/replicated/api.go
@@ -72,6 +72,8 @@ func APICmd() *cobra.Command {
 				ReplicatedAppEndpoint: replicatedConfig.ReplicatedAppEndpoint,
 				StatusInformers:       replicatedConfig.StatusInformers,
 				ManagedBy:             replicatedConfig.ManagedBy,
+				ClusterID:             replicatedConfig.ClusterID,
+				InstanceID:            replicatedConfig.InstanceID,
 				Namespace:             namespace,
 			}
 			apiserver.Start(params)

diff --git a/pkg/apiserver/bootstrap.go b/pkg/apiserver/bootstrap.go
@@ -38,10 +38,13 @@ func bootstrap(params APIServerParams) error {
 		return errors.Wrap(err, "failed to get clientset")
 	}
 
-	// retrieve replicated and app ids
-	replicatedID, appID, err := util.GetReplicatedAndAppIDs(clientset, params.Namespace)
-	if err != nil {
-		return errors.Wrap(err, "failed to get replicated and app ids")
+	replicatedID, appID := params.ClusterID, params.InstanceID
+	if replicatedID == "" || appID == "" {
+		// retrieve replicated and app ids
+		replicatedID, appID, err = util.GetReplicatedAndAppIDs(clientset, params.Namespace)
+		if err != nil {
+			return errors.Wrap(err, "failed to get replicated and app ids")
+		}
 	}
 	if replicatedID == "" {
 		return backoff.Permanent(errors.New("Replicated ID not found"))

diff --git a/pkg/apiserver/server.go b/pkg/apiserver/server.go
@@ -30,6 +30,8 @@ type APIServerParams struct {
 	ReplicatedAppEndpoint string
 	StatusInformers       []appstatetypes.StatusInformerString
 	ManagedBy             string
+	ClusterID             string
+	InstanceID            string
 	Namespace             string
 }
 

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -21,6 +21,8 @@ type ReplicatedConfig struct {
 	ReplicatedAppEndpoint string                               `yaml:"replicatedAppEndpoint"`
 	StatusInformers       []appstatetypes.StatusInformerString `yaml:"statusInformers"`
 	ManagedBy             string                               `yaml:"managedBy"`
+	ClusterID             string                               `yaml:"clusterID"`
+	InstanceID            string                               `yaml:"instanceID"`
 }
 
 func ParseReplicatedConfig(config []byte) (*ReplicatedConfig, error) {