fix iam patch logic and update image in config (kubeflow#1582)

StatCan · Sep 20, 2018 · 12603d5 · 12603d5
1 parent 51f1f2f
commit 12603d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bootstrap/cmd/bootstrap/app/gcpUtils.go b/bootstrap/cmd/bootstrap/app/gcpUtils.go
@@ -131,6 +131,9 @@ func GetUpdatedPolicy(currentPolicy *cloudresourcemanager.Policy, iamConf *IamCo
 				actualMember = val
 			}
 			for _, role := range binding.Roles {
+				if _, ok := policyMap[role]; !ok {
+					policyMap[role] = make(map[string]bool)
+				}
 				if req.Action == "add" {
 					policyMap[role][actualMember] = true
 				} else {

diff --git a/bootstrap/cmd/bootstrap/app/ksServer.go b/bootstrap/cmd/bootstrap/app/ksServer.go
@@ -355,7 +355,7 @@ func (s *ksServer) getRegistryUri(registry *RegistryConfig) (string, error) {
 			if err != nil {
 				os.Mkdir(registryPath, os.ModePerm)
 			}
-			fileUrl := path.Join(registry.Repo, "archive", registry.Version + ".tar.gz")
+			fileUrl := registry.Repo + "/archive/" + registry.Version + ".tar.gz"
 
 			err = runCmd(fmt.Sprintf("curl -L -o %v %v", versionPath + ".tar.gz", fileUrl))
 			if err != nil {

diff --git a/components/gcp-click-to-deploy/manifest/kf_app.yaml b/components/gcp-click-to-deploy/manifest/kf_app.yaml
@@ -96,14 +96,14 @@ spec:
     spec:
       containers:
       - name: web-app
-        image: gcr.io/kubeflow-images-public/test-app:0914
+        image: gcr.io/kubeflow-images-public/test-app:091802
         ports:
         - containerPort: 3000
         volumeMounts:
         - name: config-volume
           mountPath: /app/src/user_config
       - name: controller-backend
-        image: gcr.io/kubeflow-images-public/bootstrapper:v20180913-0ec42ca3-dirty-b41bd1 
+        image: gcr.io/kubeflow-images-public/bootstrapper:v20180919-8a2e8c7-dirty-9c6b53
         workingDir: /opt/bootstrap
         command: [ "/opt/kubeflow/bootstrapper"]
         args: [