[WIP] Catch up with the recent changes

Author: arybolovlev

charts/test/unit/deployment_test.go

@@ -42,7 +42,7 @@ func TestDeploymentDefault(t *testing.T) {
 		Image:   "hashicorp/hcp-terraform-operator:2.7.0",
 		Command: []string{"/manager"},
 		Args: []string{
-			"--sync-period=5m",
+			"--sync-period=1h",
 			"--agent-pool-workers=1",
 			"--agent-pool-sync-period=30s",
 			"--module-workers=1",
@@ -101,7 +101,7 @@ func TestDeploymentDefault(t *testing.T) {
 	}, spec.Containers[0])
 	assert.Equal(t, corev1.Container{
 		Name:  "kube-rbac-proxy",
-		Image: "quay.io/brancz/kube-rbac-proxy:v0.18.0",
+		Image: "quay.io/brancz/kube-rbac-proxy:v0.18.2",
 		Args: []string{
 			"--secure-listen-address=0.0.0.0:8443",
 			"--upstream=http://127.0.0.1:8080/",
@@ -137,19 +137,7 @@ func TestDeploymentDefault(t *testing.T) {
 		},
 	}, spec.Containers[1])
 
-	assert.Equal(t, defaultServiceAccountName, deployment.Spec.Template.Spec.ServiceAccountName)
-	assert.Equal(t, &corev1.PodSecurityContext{RunAsNonRoot: ptr.To(true)}, deployment.Spec.Template.Spec.SecurityContext)
-	assert.Equal(t, &defaultDeploymentTerminationGracePeriodSeconds, deployment.Spec.Template.Spec.TerminationGracePeriodSeconds)
-	assert.Equal(t, []corev1.Volume{
-		{
-			Name: defaultDeploymentTemplateVolumeName,
-			VolumeSource: corev1.VolumeSource{
-				ConfigMap: &corev1.ConfigMapVolumeSource{
-					LocalObjectReference: corev1.LocalObjectReference{
-						Name: defaultDeploymentTemplateVolumeConfigMapName,
-					},
-				},
-			},
-		},
-	}, deployment.Spec.Template.Spec.Volumes)
+	assert.Equal(t, defaultServiceAccountName, spec.ServiceAccountName)
+	assert.Equal(t, &corev1.PodSecurityContext{RunAsNonRoot: ptr.To(true)}, spec.SecurityContext)
+	assert.Equal(t, &defaultDeploymentTerminationGracePeriodSeconds, spec.TerminationGracePeriodSeconds)
 }

charts/test/unit/rbac_clusster_role_manager_test.go

@@ -50,7 +50,10 @@ func testRBACClusterRoleManagerRules(t *testing.T, rbac rbacv1.ClusterRole) {
 				"watch",
 			},
 			APIGroups: []string{""},
-			Resources: []string{"configmaps"},
+			Resources: []string{
+				"configmaps",
+				"secrets",
+			},
 		},
 		{
 			Verbs: []string{
@@ -60,29 +63,6 @@ func testRBACClusterRoleManagerRules(t *testing.T, rbac rbacv1.ClusterRole) {
 			APIGroups: []string{""},
 			Resources: []string{"events"},
 		},
-		{
-			Verbs: []string{
-				"create",
-				"list",
-				"update",
-				"watch",
-			},
-			APIGroups: []string{""},
-			Resources: []string{"secrets"},
-		},
-		{
-			Verbs: []string{
-				"create",
-				"delete",
-				"get",
-				"list",
-				"patch",
-				"update",
-				"watch",
-			},
-			APIGroups: []string{"apps"},
-			Resources: []string{"deployments"},
-		},
 		{
 			Verbs: []string{
 				"create",
@@ -94,81 +74,38 @@ func testRBACClusterRoleManagerRules(t *testing.T, rbac rbacv1.ClusterRole) {
 				"watch",
 			},
 			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"agentpools"},
-		},
-		{
-			Verbs: []string{
-				"update",
+			Resources: []string{
+				"agentpools",
+				"modules",
+				"projects",
+				"workspaces",
 			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"agentpools/finalizers"},
 		},
 		{
 			Verbs: []string{
-				"get",
-				"patch",
 				"update",
 			},
 			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"agentpools/status"},
-		},
-		{
-			Verbs: []string{
-				"create",
-				"delete",
-				"get",
-				"list",
-				"patch",
-				"update",
-				"watch",
+			Resources: []string{
+				"agentpools/finalizers",
+				"modules/finalizers",
+				"projects/finalizers",
+				"workspaces/finalizers",
 			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"modules"},
 		},
 		{
 			Verbs: []string{
-				"update",
-			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"modules/finalizers"},
-		},
-		{
-			Verbs: []string{
-				"get",
-				"patch",
-				"update",
-			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"modules/status"},
-		},
-		{
-			Verbs: []string{
-				"create",
-				"delete",
 				"get",
-				"list",
 				"patch",
 				"update",
-				"watch",
 			},
 			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"projects"},
-		},
-		{
-			Verbs: []string{
-				"update",
-			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"projects/finalizers"},
-		},
-		{
-			Verbs: []string{
-				"get",
-				"patch",
-				"update",
+			Resources: []string{
+				"agentpools/status",
+				"modules/status",
+				"projects/status",
+				"workspaces/status",
 			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"projects/status"},
 		},
 		{
 			Verbs: []string{
@@ -180,24 +117,8 @@ func testRBACClusterRoleManagerRules(t *testing.T, rbac rbacv1.ClusterRole) {
 				"update",
 				"watch",
 			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"workspaces"},
-		},
-		{
-			Verbs: []string{
-				"update",
-			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"workspaces/finalizers"},
-		},
-		{
-			Verbs: []string{
-				"get",
-				"patch",
-				"update",
-			},
-			APIGroups: []string{"app.terraform.io"},
-			Resources: []string{"workspaces/status"},
+			APIGroups: []string{"apps"},
+			Resources: []string{"deployments"},
 		},
 	}
 	assert.Equal(t, rules, rbac.Rules)