use apex staffjoy-uat.local for uat

mnisummer · Jul 24, 2019 · 71b58a5 · 71b58a5
1 parent 06056d6
commit 71b58a5
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 8 deletions.
diff --git a/common-lib/src/main/java/xyz/staffjoy/common/env/EnvConfig.java b/common-lib/src/main/java/xyz/staffjoy/common/env/EnvConfig.java
@@ -38,11 +38,11 @@ public class EnvConfig {
                 .build();
         map.put(EnvConstant.ENV_TEST, envConfig);
 
-        // for aliyun k8s demo, enable debug and use http
-        // in practice, disable debug and use http in UAT environment
+        // for aliyun k8s demo, enable debug and use http and staffjoy-uat.local
+        // in real world, disable debug and use http and staffjoy-uat.xyz in UAT environment
         envConfig = EnvConfig.builder().name(EnvConstant.ENV_UAT)
                 .debug(true)
-                .externalApex("staffjoy-uat.xyz")
+                .externalApex("staffjoy-uat.local")
                 .internalApex(EnvConstant.ENV_UAT)
                 .scheme("http")
                 .build();
@@ -58,7 +58,7 @@ public class EnvConfig {
 
         envConfig = EnvConfig.builder().name(EnvConstant.ENV_PROD)
                 .debug(false)
-                .externalApex("staffjoy.xyz")
+                .externalApex("staffjoy.com")
                 .internalApex(EnvConstant.ENV_PROD)
                 .scheme("https")
                 .build();

diff --git a/frontend/app/src/constants/paths.js b/frontend/app/src/constants/paths.js
@@ -9,8 +9,8 @@ import {
 
 // apex for the various staffjoy environments
 export const DEVELOPMENT_APEX = '.staffjoy-v2.local';
-export const UAT_APEX = '.staffjoy-uat.xyz';
-export const PRODUCTION_APEX = '.staffjoy.xyz';
+export const UAT_APEX = '.staffjoy-uat.local';
+export const PRODUCTION_APEX = '.staffjoy.com';
 
 // http prefixes
 export const HTTP_PREFIX = 'http://';

diff --git a/frontend/myaccount/src/constants/config.js b/frontend/myaccount/src/constants/config.js
@@ -14,8 +14,8 @@ export const SENTRY_UAT_KEY = 'https://[email protected]
 export const HTTP_PREFIX = 'http://';
 export const HTTPS_PREFIX = 'https://';
 export const DEVELOPMENT_APEX = '.staffjoy-v2.local';
-export const UAT_APEX = '.staffjoy-uat.xyz';
-export const PRODUCTION_APEX = '.staffjoy.xyz';
+export const UAT_APEX = '.staffjoy-uat.local';
+export const PRODUCTION_APEX = '.staffjoy.com';
 
 const DEFAULT_REFETCH_INTERVAL = 10;
 

diff --git a/k8s/uat/canary/www-web-canary.yaml b/k8s/uat/canary/www-web-canary.yaml
@@ -0,0 +1,30 @@
+# https://matthewpalmer.net/kubernetes-app-developer/articles/kubernetes-apiversion-definition-guide.html
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: www-web-deployment-canary
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: www-svc
+        env: uat
+        track: canary
+    spec:
+      containers:
+        - name: www-svc
+          image: boboweike/www-svc:v1.3-blue
+          ports:
+            - name: http-port
+              containerPort: 80
+          envFrom:
+            - configMapRef:
+                name: common-config
+          volumeMounts:
+            - name: logback-config-volume
+              mountPath: /etc/staffjoy
+      volumes:
+        - name: logback-config-volume
+          configMap:
+            name: logback-config
diff --git a/k8s/uat/www-web.yaml b/k8s/uat/www-web.yaml
@@ -10,6 +10,7 @@ spec:
       labels:
         app: www-svc
         env: uat
+        track: stable
     spec:
       containers:
         - name: www-svc