Merge pull request #1048 from replicatedhq/laverya/kotsadm-not-ship-v…

…ersion find and replace SHIP_CLUSTER_BUILD_VERSION -> KOTSADM_BUILD_VERSION
replicatedhq · Sep 1, 2020 · 1b26c7a · 1b26c7a
2 parents 7358850 + f3922b4
commit 1b26c7a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/kotsadm/web/Makefile b/kotsadm/web/Makefile
@@ -53,9 +53,9 @@ build-local:
 		--compress
 
 .PHONY: build-kotsadm
-build-kotsadm: SHIP_CLUSTER_BUILD_VERSION = $(if ${GIT_TAG},${GIT_TAG},$(shell echo ${GIT_COMMIT} | cut -c1-7))
+build-kotsadm: KOTSADM_BUILD_VERSION = $(if ${GIT_TAG},${GIT_TAG},$(shell echo ${GIT_COMMIT} | cut -c1-7))
 build-kotsadm:
-	SHIP_CLUSTER_BUILD_VERSION=$(SHIP_CLUSTER_BUILD_VERSION) \
+	KOTSADM_BUILD_VERSION=$(KOTSADM_BUILD_VERSION) \
 	node \
 		--max_old_space_size=6144 \
 		./node_modules/webpack/bin/webpack.js \

diff --git a/kotsadm/web/env/enterprise.js b/kotsadm/web/env/enterprise.js
@@ -2,8 +2,8 @@ module.exports = {
   ENVIRONMENT: "production",
   SECURE_ADMIN_CONSOLE: true,
   API_ENDPOINT: "/api/v1",
-  SHIP_CLUSTER_BUILD_VERSION: (function () {
-    return process.env.SHIP_CLUSTER_BUILD_VERSION;
+  KOTSADM_BUILD_VERSION: (function () {
+    return process.env.KOTSADM_BUILD_VERSION;
   }()),
 };
 
diff --git a/kotsadm/web/env/skaffold.js b/kotsadm/web/env/skaffold.js
@@ -2,7 +2,7 @@ module.exports = {
   ENVIRONMENT: "development",
   SECURE_ADMIN_CONSOLE: true,
   API_ENDPOINT: "http://127.0.0.1:30065/api/v1",
-  SHIP_CLUSTER_BUILD_VERSION: (function () {
+  KOTSADM_BUILD_VERSION: (function () {
     return String(Date.now());
   }()),
 };
diff --git a/kotsadm/web/eslint-dist.yml b/kotsadm/web/eslint-dist.yml
@@ -8,7 +8,7 @@ env:
   browser: true
 globals:
   ENVIRONMENT: true
-  SHIP_CLUSTER_BUILD_VERSION: true
+  KOTSADM_BUILD_VERSION: true
   GITHUB_CLIENTID: true
   BUGSNAG_RELEASE_STAGE: true
   INTERCOM_APP_ID: true

diff --git a/kotsadm/web/src/utilities/utilities.js b/kotsadm/web/src/utilities/utilities.js
@@ -56,7 +56,7 @@ export function getApplicationType(watch) {
  * @param {String} - Returns the commit SHA of the current build
  */
 export function getBuildVersion() {
-  return window.env.SHIP_CLUSTER_BUILD_VERSION;
+  return window.env.KOTSADM_BUILD_VERSION;
 }
 
 export function parseIconUri(uri) {

diff --git a/kotsadm/web/webpack.config.dist.js b/kotsadm/web/webpack.config.dist.js
@@ -14,7 +14,7 @@ function getPlugins(appEnv, env) {
       apiKey: appEnv.BUGSNAG_API_KEY,
       publicPath: appEnv.PUBLIC_ASSET_PATH,
       releaseStage: appEnv.ENVIRONMENT,
-      appVersion: appEnv.SHIP_CLUSTER_BUILD_VERSION,
+      appVersion: appEnv.KOTSADM_BUILD_VERSION,
       overwrite: true
     }));
   }