fix(gw/api): undo inversion, misunderstood sean is misunderstood

brigadecore · Dec 21, 2017 · 1b72708 · 1b72708
1 parent d85d29c
commit 1b72708
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/brigade-api/cmd/brigade-api/main.go b/brigade-api/cmd/brigade-api/main.go
@@ -76,7 +76,7 @@ func defaultAPIPort() string {
 	if port, ok := os.LookupEnv("BRIGADE_API_PORT"); ok {
 		return port
 	}
-	return "7744"
+	return "7745"
 }
 
 func cors(c *gin.Context) {

diff --git a/brigade-gateway/cmd/brigade-gateway/server.go b/brigade-gateway/cmd/brigade-gateway/server.go
@@ -67,7 +67,7 @@ func defaultGatewayPort() string {
 	if port, ok := os.LookupEnv("BRIGADE_GATEWAY_PORT"); ok {
 		return port
 	}
-	return "7745"
+	return "7744"
 }
 
 func defaultBuildForkedPRs() bool {

diff --git a/charts/brigade/templates/api-deployment.yaml b/charts/brigade/templates/api-deployment.yaml
@@ -38,7 +38,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: BRIGADE_API_PORT
-            value: {{ default "7744" .Values.api.service.internalPort }}
+            value: {{ .Values.api.service.internalPort | quote }}
       {{ if .Values.privateRegistry }}imagePullSecrets:
         - name: {{.Values.privateRegistry}}{{ end }}
 {{ end }}
diff --git a/charts/brigade/templates/gateway-deployment.yaml b/charts/brigade/templates/gateway-deployment.yaml
@@ -43,7 +43,7 @@ spec:
           - name: BRIGADE_BUILD_FORKED_PULL_REQUESTS
             value: {{ default "" .Values.gw.buildForkedPullRequests }}
           - name: BRIGADE_GATEWAY_PORT
-            value: {{ default "7745" .Values.service.internalPort }}
+            value: {{ .Values.service.internalPort | quote }}
       {{ if .Values.privateRegistry }}imagePullSecrets:
         - name: {{.Values.privateRegistry}}{{ end }}
 {{ end }}
diff --git a/charts/brigade/values.yaml b/charts/brigade/values.yaml
@@ -59,8 +59,8 @@ api:
   service:
     name: brigade-api
     type: ClusterIP
-    externalPort: 7744
-    internalPort: 7744
+    externalPort: 7745
+    internalPort: 7745
 
 # worker is the JavaScript worker. These are created on demand by the controller.
 worker:
@@ -130,8 +130,8 @@ vacuum:
 service:
   name: brigade-service
   type: LoadBalancer
-  externalPort: 7745
-  internalPort: 7745
+  externalPort: 7744
+  internalPort: 7744
 # By default, this is off. If you enable it, you might want to change the
 # service.type to ClusterIP
 ingress: