Fix ClusterRoleBinding

gitpod-io · Jan 14, 2022 · e754d0d · e754d0d
1 parent 41668bc
commit e754d0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/installer/pkg/components/registry-facade/daemonset.go b/installer/pkg/components/registry-facade/daemonset.go
@@ -154,6 +154,13 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 							[]corev1.EnvVar{{
 								Name:  "GRPC_GO_RETRY",
 								Value: "on",
+							}, {
+								Name: "NODENAME",
+								ValueFrom: &corev1.EnvVarSource{
+									FieldRef: &corev1.ObjectFieldSelector{
+										FieldPath: "spec.nodeName",
+									},
+								},
 							}},
 						),
 						VolumeMounts: append([]corev1.VolumeMount{{

diff --git a/installer/pkg/components/ws-daemon/rolebinding.go b/installer/pkg/components/ws-daemon/rolebinding.go
@@ -37,12 +37,11 @@ func rolebinding(ctx *common.RenderContext) ([]runtime.Object, error) {
 				},
 			},
 		},
-		&rbacv1.RoleBinding{
-			TypeMeta: common.TypeMetaRoleBinding,
+		&rbacv1.ClusterRoleBinding{
+			TypeMeta: common.TypeMetaClusterRoleBinding,
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      fmt.Sprintf("%s-rb", Component),
-				Namespace: ctx.Namespace,
-				Labels:    labels,
+				Name:   fmt.Sprintf("%s-%s-rb", ctx.Namespace, Component),
+				Labels: labels,
 			},
 			Subjects: []rbacv1.Subject{{
 				Kind: "ServiceAccount",