kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gce: Fix google_project_iam_binding member -> members

This commit is contained in:
justinsb 2021-12-17 13:03:23 -05:00
parent 7270fd9165
commit 61e2cb2b73
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/truncate/truncate.go
View File

@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package truncate package truncate
import ( import (

4
tests/integration/update_cluster/ha_gce/kubernetes.tf
View File

@ -721,13 +721,13 @@ resource "google_compute_subnetwork" "us-test1-ha-gce-example-com" {
} }
resource "google_project_iam_binding" "serviceaccount-control-plane" { resource "google_project_iam_binding" "serviceaccount-control-plane" {
member = "serviceAccount:control-plane-ha-gce-ex-mr702t@testproject.iam.gserviceaccount.com" members = ["serviceAccount:control-plane-ha-gce-ex-mr702t@testproject.iam.gserviceaccount.com"]
project = "testproject" project = "testproject"
role = "roles/container.serviceAgent" role = "roles/container.serviceAgent"
} }
resource "google_project_iam_binding" "serviceaccount-nodes" { resource "google_project_iam_binding" "serviceaccount-nodes" {
member = "serviceAccount:node-ha-gce-example-com@testproject.iam.gserviceaccount.com" members = ["serviceAccount:node-ha-gce-example-com@testproject.iam.gserviceaccount.com"]
project = "testproject" project = "testproject"
role = "roles/compute.viewer" role = "roles/compute.viewer"
} }

4
tests/integration/update_cluster/minimal_gce/kubernetes.tf
View File

@ -525,13 +525,13 @@ resource "google_compute_subnetwork" "us-test1-minimal-gce-example-com" {
} }
resource "google_project_iam_binding" "serviceaccount-control-plane" { resource "google_project_iam_binding" "serviceaccount-control-plane" {
member = "serviceAccount:control-plane-minimal-g-fu1mg6@testproject.iam.gserviceaccount.com" members = ["serviceAccount:control-plane-minimal-g-fu1mg6@testproject.iam.gserviceaccount.com"]
project = "testproject" project = "testproject"
role = "roles/container.serviceAgent" role = "roles/container.serviceAgent"
} }
resource "google_project_iam_binding" "serviceaccount-nodes" { resource "google_project_iam_binding" "serviceaccount-nodes" {
member = "serviceAccount:node-minimal-gce-example-com@testproject.iam.gserviceaccount.com" members = ["serviceAccount:node-minimal-gce-example-com@testproject.iam.gserviceaccount.com"]
project = "testproject" project = "testproject"
role = "roles/compute.viewer" role = "roles/compute.viewer"
} }

4
tests/integration/update_cluster/minimal_gce_private/kubernetes.tf
View File

@ -538,13 +538,13 @@ resource "google_compute_subnetwork" "us-test1-minimal-gce-private-example-com"
} }
resource "google_project_iam_binding" "serviceaccount-control-plane" { resource "google_project_iam_binding" "serviceaccount-control-plane" {
member = "serviceAccount:control-plane-minimal-g-sh4okp@testproject.iam.gserviceaccount.com" members = ["serviceAccount:control-plane-minimal-g-sh4okp@testproject.iam.gserviceaccount.com"]
project = "testproject" project = "testproject"
role = "roles/container.serviceAgent" role = "roles/container.serviceAgent"
} }
resource "google_project_iam_binding" "serviceaccount-nodes" { resource "google_project_iam_binding" "serviceaccount-nodes" {
member = "serviceAccount:node-minimal-gce-privat-sh4okp@testproject.iam.gserviceaccount.com" members = ["serviceAccount:node-minimal-gce-privat-sh4okp@testproject.iam.gserviceaccount.com"]
project = "testproject" project = "testproject"
role = "roles/compute.viewer" role = "roles/compute.viewer"
} }

8
upup/pkg/fi/cloudup/gcetasks/projectiambinding.go
View File

@ -127,16 +127,16 @@ func (_ *ProjectIAMBinding) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Projec
// terraformProjectIAMBinding is the model for a terraform google_project_iam_binding rule // terraformProjectIAMBinding is the model for a terraform google_project_iam_binding rule
type terraformProjectIAMBinding struct { type terraformProjectIAMBinding struct {
Project string `json:"project,omitempty" cty:"project"` Project string `json:"project,omitempty" cty:"project"`
Role string `json:"role,omitempty" cty:"role"` Role string `json:"role,omitempty" cty:"role"`
Member string `json:"member,omitempty" cty:"member"` Members []string `json:"members,omitempty" cty:"members"`
} }
func (_ *ProjectIAMBinding) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ProjectIAMBinding) error { func (_ *ProjectIAMBinding) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ProjectIAMBinding) error {
tf := &terraformProjectIAMBinding{ tf := &terraformProjectIAMBinding{
Project: fi.StringValue(e.Project), Project: fi.StringValue(e.Project),
Role: fi.StringValue(e.Role), Role: fi.StringValue(e.Role),
Member: fi.StringValue(e.Member), Members: []string{fi.StringValue(e.Member)},
} }
return t.RenderResource("google_project_iam_binding", *e.Name, tf) return t.RenderResource("google_project_iam_binding", *e.Name, tf)