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

Don't add IRSA env vars if feature flag is not enabled

This commit is contained in:
Ole Markus With 2021-05-06 11:18:07 +02:00
parent e3fbc2ad04
commit 5d4f6e6dee
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/model/components/addonmanifests/BUILD.bazel generated
View File

@ -8,6 +8,7 @@ go_library(
deps = [
"//channels/pkg/api:go_default_library",
"//pkg/assets:go_default_library",
"//pkg/featureflag:go_default_library",
"//pkg/kubemanifest:go_default_library",
"//pkg/model:go_default_library",
"//pkg/model/components/addonmanifests/awsloadbalancercontroller:go_default_library",

5
pkg/model/components/addonmanifests/remap.go
View File

@ -25,6 +25,7 @@ import (
"k8s.io/klog/v2"
addonsapi "k8s.io/kops/channels/pkg/api"
"k8s.io/kops/pkg/assets"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/pkg/kubemanifest"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/components/addonmanifests/awsloadbalancercontroller"
@ -78,6 +79,10 @@ func RemapAddonManifest(addon *addonsapi.AddonSpec, context *model.KopsModelCont
}
func addServiceAccountRole(context *model.KopsModelContext, objects kubemanifest.ObjectList) error {
if !featureflag.UseServiceAccountIAM.Enabled() {
return nil
}
for _, object := range objects {
if object.Kind() != "Deployment" {
continue