Update proxy core (#32)

Gopkg.toml

@@ -27,11 +27,11 @@
 
 [[constraint]]
   name = "github.com/kubernetes-incubator/service-catalog"
-  version = "=0.1.27"
+  version = "=0.1.36"
 
 [[constraint]]
   name = "github.com/Peripli/service-broker-proxy"
-  branch = "master"
+  version = "0.1.1"
 
 [[constraint]]
   name = "github.com/onsi/ginkgo"

application.yml

@@ -22,13 +22,15 @@ sm:
   request_timeout: 6000ms
   skip_ssl_validation: true
   resync_period: 1m
+app:
+  user: admin
+  password: admin
+  url: http://localhost:8081
 k8s:
   client:
     timeout: 6000ms
-  reg:
-    # To run locally you need to create a secret in the k8s cluster
-    user: admin
-    password: admin
-    secret:
-      name: service-broker-proxy-regsecret
-      namespace: service-broker-proxy
+  # To run locally you need to create a secret in the k8s
+  # cluster with username: app.user and password app.password
+  secret:
+    name: service-broker-proxy-regsecret
+    namespace: service-broker-proxy

charts/service-broker-proxy-k8s/templates/broker-secret.yaml

@@ -8,5 +8,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  username: {{ .Values.reg.user | b64enc }}
-  password: {{ .Values.reg.password | b64enc }}
+  username: {{ .Values.app.username | b64enc }}
+  password: {{ .Values.app.password | b64enc }}

charts/service-broker-proxy-k8s/templates/deployment.yaml

@@ -33,8 +33,22 @@ spec:
           mountPath: {{ .Values.file.location }}
           readOnly: true
         env:
+        - name: K8S_SECRET_NAME
+          value: {{ template "service-broker-proxy.fullname" . }}-regsecret
+        - name: K8S_SECRET_NAMESPACE
+          value: {{ .Release.Namespace }}
         - name: APP_URL
-          value: http://{{ template "service-broker-proxy.name" . }}.{{ .Release.Namespace }}:{{ .Values.service.port }}
+          value: http://{{ template "service-broker-proxy.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.port }}
+        - name: APP_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: {{ template "service-broker-proxy.fullname" . }}-regsecret
+              key: username
+        - name: APP_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ template "service-broker-proxy.fullname" . }}-regsecret
+              key: password
         - name: SM_USER
           valueFrom:
             secretKeyRef:
@@ -45,20 +59,6 @@ spec:
             secretKeyRef:
               name: {{ template "service-broker-proxy.fullname" . }}-secret
               key: sm_password
-        - name: K8S_REG_SECRET_NAME
-          value: {{ template "service-broker-proxy.fullname" . }}-regsecret
-        - name: K8S_REG_SECRET_NAMESPACE
-          value: {{ .Release.Namespace }}
-        - name: K8S_REG_USER
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "service-broker-proxy.fullname" . }}-regsecret
-              key: username
-        - name: K8S_REG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "service-broker-proxy.fullname" . }}-regsecret
-              key: password
         ports:
         - name: http
           containerPort: 8081

charts/service-broker-proxy-k8s/values.yaml

@@ -23,8 +23,8 @@ sm:
   password: admin
 
 # Credentials used to register the proxy as a broker
-reg:
-  user: admin
+app:
+  username: admin
   password: admin
 
 config: