MGMT-16517: Add Env Var to podman and SaaS templates

https://issues.redhat.com/browse/MGMT-16517
openshift · Jan 30, 2024 · 6c5a61f · 6c5a61f
1 parent 12a19ce
commit 6c5a61f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 0 deletions.
diff --git a/deploy/assisted-service.yaml b/deploy/assisted-service.yaml
@@ -44,6 +44,8 @@ spec:
               value: "ai-kafka-0.ai-kafka-headless.assisted-installer.svc.cluster.local:9092"
             - name: KAFKA_EVENT_STREAM_TOPIC
               value: "events-stream"
+            - name: DEPLOYMENT_TYPE
+              value: "SaaS"
             - name: DB_HOST
               valueFrom:
                 secretKeyRef:

diff --git a/deploy/podman/configmap-disconnected.yml b/deploy/podman/configmap-disconnected.yml
@@ -12,6 +12,7 @@ data:
   DB_PORT: "5432"
   DB_USER: admin
   DEPLOY_TARGET: onprem
+  DEPLOYMENT_TYPE: "Podman"
   DISK_ENCRYPTION_SUPPORT: "true"
   DUMMY_IGNITION: "false"
   ENABLE_SINGLE_NODE_DNSMASQ: "true"

diff --git a/deploy/podman/configmap.yml b/deploy/podman/configmap.yml
@@ -12,6 +12,7 @@ data:
   DB_PORT: "5432"
   DB_USER: admin
   DEPLOY_TARGET: onprem
+  DEPLOYMENT_TYPE: "Podman"
   DISK_ENCRYPTION_SUPPORT: "true"
   DUMMY_IGNITION: "false"
   ENABLE_SINGLE_NODE_DNSMASQ: "true"

diff --git a/deploy/podman/configmap_tls.yml b/deploy/podman/configmap_tls.yml
@@ -16,6 +16,7 @@ data:
   DB_PORT: "5432"
   DB_USER: admin
   DEPLOY_TARGET: onprem
+  DEPLOYMENT_TYPE: "Podman"
   DISK_ENCRYPTION_SUPPORT: "true"
   DUMMY_IGNITION: "false"
   ENABLE_SINGLE_NODE_DNSMASQ: "true"

diff --git a/internal/uploader/events_uploader.go b/internal/uploader/events_uploader.go
@@ -180,6 +180,7 @@ func metadataFile(tw *tar.Writer, clusterID *strfmt.UUID, config Config) {
 	metadata := versions.GetModelVersions(config.Versions)
 	metadata["deployment-type"] = config.DeploymentType
 	metadata["deployment-version"] = config.DeploymentVersion
+	metadata["git-ref"] = config.AssistedServiceVersion
 
 	if metadataJson, err := json.Marshal(metadata); err == nil {
 		addFile(tw, metadataJson, fmt.Sprintf("%s/metadata.json", *clusterID)) //nolint:errcheck // errors adding this file shouldn't prevent the data from being sent

diff --git a/internal/uploader/events_uploader_test.go b/internal/uploader/events_uploader_test.go
@@ -667,6 +667,7 @@ func checkMetadataFile(metadataFile *testFile, cfg Config) {
 		expectedMetadata := versions.GetModelVersions(cfg.Versions)
 		expectedMetadata["deployment-type"] = cfg.DeploymentType
 		expectedMetadata["deployment-version"] = cfg.DeploymentVersion
+		expectedMetadata["git-ref"] = cfg.AssistedServiceVersion
 		Expect(metadataContents).To(BeEquivalentTo(expectedMetadata))
 	}
 }
diff --git a/openshift/template.yaml b/openshift/template.yaml
@@ -195,6 +195,8 @@ parameters:
 - name: ENABLE_DATA_COLLECTION
   value: "false"
   required: false
+- name: DEPLOYMENT_TYPE
+  value: "SaaS"
 - name: INSTALLER_CACHE_CAPACITY
   value: "6442450944"
   required: false
@@ -457,6 +459,8 @@ objects:
                 value: ${ENABLE_REJECT_UNKNOWN_FIELDS}
               - name: ENABLE_DATA_COLLECTION
                 value: ${ENABLE_DATA_COLLECTION}
+              - name: DEPLOYMENT_TYPE
+                value: ${DEPLOYMENT_TYPE}
               - name: INSTALLER_CACHE_CAPACITY
                 value: ${INSTALLER_CACHE_CAPACITY}
               - name: ENABLE_OKD_SUPPORT