Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: KopsModelContext embeds IAMModelContext #9814

Merged
merged 1 commit into from
Aug 25, 2020
Merged

Refactor: KopsModelContext embeds IAMModelContext #9814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/model/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ go_test(
deps = [
"//pkg/apis/kops:go_default_library",
"//pkg/apis/nodeup:go_default_library",
"//pkg/model/iam:go_default_library",
"//pkg/testutils/golden:go_default_library",
"//upup/pkg/fi:go_default_library",
"//util/pkg/architectures:go_default_library",
Expand Down
1 change: 1 addition & 0 deletions pkg/model/awsmodel/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ go_test(
deps = [
"//pkg/apis/kops:go_default_library",
"//pkg/model:go_default_library",
"//pkg/model/iam:go_default_library",
"//upup/pkg/fi:go_default_library",
"//upup/pkg/fi/cloudup/awstasks:go_default_library",
],
Expand Down
7 changes: 4 additions & 3 deletions pkg/model/awsmodel/autoscalinggroup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
)
Expand Down Expand Up @@ -78,9 +79,9 @@ func TestRootVolumeOptimizationFlag(t *testing.T) {
b := AutoscalingGroupModelBuilder{
AWSModelContext: &AWSModelContext{
KopsModelContext: &model.KopsModelContext{
SSHPublicKeys: k,
Cluster: cluster,
InstanceGroups: igs,
IAMModelContext: iam.IAMModelContext{Cluster: cluster},
SSHPublicKeys: k,
InstanceGroups: igs,
},
},
}
Expand Down
1 change: 1 addition & 0 deletions pkg/model/components/etcdmanager/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ go_test(
deps = [
"//pkg/assets:go_default_library",
"//pkg/model:go_default_library",
"//pkg/model/iam:go_default_library",
"//pkg/testutils:go_default_library",
"//upup/pkg/fi:go_default_library",
],
Expand Down
5 changes: 3 additions & 2 deletions pkg/model/components/etcdmanager/model_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"k8s.io/kops/pkg/assets"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/pkg/testutils"
"k8s.io/kops/upup/pkg/fi"
)
Expand Down Expand Up @@ -77,8 +78,8 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
}

kopsContext := &model.KopsModelContext{
Cluster: spec.Cluster,
InstanceGroups: spec.InstanceGroups,
IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
InstanceGroups: spec.InstanceGroups,
}

return kopsContext, nil
Expand Down
1 change: 1 addition & 0 deletions pkg/model/components/kubeapiserver/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ go_test(
deps = [
"//pkg/assets:go_default_library",
"//pkg/model:go_default_library",
"//pkg/model/iam:go_default_library",
"//pkg/testutils:go_default_library",
"//upup/pkg/fi:go_default_library",
],
Expand Down
5 changes: 3 additions & 2 deletions pkg/model/components/kubeapiserver/model_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"k8s.io/kops/pkg/assets"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/pkg/testutils"
"k8s.io/kops/upup/pkg/fi"
)
Expand Down Expand Up @@ -70,8 +71,8 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
}

kopsContext := &model.KopsModelContext{
Cluster: spec.Cluster,
InstanceGroups: spec.InstanceGroups,
IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
InstanceGroups: spec.InstanceGroups,
}

return kopsContext, nil
Expand Down
8 changes: 2 additions & 6 deletions pkg/model/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"k8s.io/kops/pkg/apis/kops/util"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/pkg/model/components"
"k8s.io/kops/pkg/model/iam"
nodeidentityaws "k8s.io/kops/pkg/nodeidentity/aws"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
Expand All @@ -47,7 +48,7 @@ var UseLegacyELBName = featureflag.New("UseLegacyELBName", featureflag.Bool(fals

// KopsModelContext is the kops model
type KopsModelContext struct {
Cluster *kops.Cluster
iam.IAMModelContext
InstanceGroups []*kops.InstanceGroup
Region string
SSHPublicKeys [][]byte
Expand Down Expand Up @@ -97,11 +98,6 @@ func (m *KopsModelContext) GetELBName32(prefix string) string {
return s
}

// ClusterName returns the cluster name
func (m *KopsModelContext) ClusterName() string {
return m.Cluster.ObjectMeta.Name
}

// GatherSubnets maps the subnet names in an InstanceGroup to the ClusterSubnetSpec objects (which are stored on the Cluster)
func (m *KopsModelContext) GatherSubnets(ig *kops.InstanceGroup) ([]*kops.ClusterSubnetSpec, error) {
var subnets []*kops.ClusterSubnetSpec
Expand Down
9 changes: 6 additions & 3 deletions pkg/model/context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/model/iam"
)

func Test_GetELBName32(t *testing.T) {
Expand Down Expand Up @@ -48,9 +49,11 @@ func Test_GetELBName32(t *testing.T) {
}
for _, g := range grid {
c := &KopsModelContext{
Cluster: &kops.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: g.ClusterName,
IAMModelContext: iam.IAMModelContext{
Cluster: &kops.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: g.ClusterName,
},
},
},
}
Expand Down
9 changes: 6 additions & 3 deletions pkg/model/firewall_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/model/iam"
)

func Test_SharedGroups(t *testing.T) {
Expand Down Expand Up @@ -48,9 +49,11 @@ func Test_SharedGroups(t *testing.T) {
}
for _, g := range grid {
c := &KopsModelContext{
Cluster: &kops.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: g.ClusterName,
IAMModelContext: iam.IAMModelContext{
Cluster: &kops.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: g.ClusterName,
},
},
},
}
Expand Down
11 changes: 11 additions & 0 deletions pkg/model/iam/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package iam
import (
"encoding/json"
"fmt"

"k8s.io/kops/pkg/apis/kops"
)

// ParseStatements parses JSON into a list of Statements
Expand All @@ -29,3 +31,12 @@ func ParseStatements(policy string) ([]*Statement, error) {
}
return statements, nil
}

type IAMModelContext struct {
Cluster *kops.Cluster
}

// ClusterName returns the cluster name
func (b *IAMModelContext) ClusterName() string {
return b.Cluster.ObjectMeta.Name
}
1 change: 1 addition & 0 deletions pkg/model/openstackmodel/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ go_test(
"//pkg/apis/kops:go_default_library",
"//pkg/apis/nodeup:go_default_library",
"//pkg/model:go_default_library",
"//pkg/model/iam:go_default_library",
"//upup/pkg/fi:go_default_library",
"//upup/pkg/fi/cloudup/openstacktasks:go_default_library",
"//util/pkg/architectures:go_default_library",
Expand Down
7 changes: 4 additions & 3 deletions pkg/model/openstackmodel/servergroup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/nodeup"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/openstacktasks"
"k8s.io/kops/util/pkg/architectures"
Expand Down Expand Up @@ -3059,9 +3060,9 @@ func createBuilderForCluster(cluster *kops.Cluster, instanceGroups []*kops.Insta
sshPublicKey := []byte("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDF2sghZsClUBXJB4mBMIw8rb0hJWjg1Vz4eUeXwYmTdi92Gf1zNc5xISSip9Y+PWX/jJokPB7tgPnMD/2JOAKhG1bi4ZqB15pYRmbbBekVpM4o4E0dx+czbqjiAm6wlccTrINK5LYenbucAAQt19eH+D0gJwzYUK9SYz1hWnlGS+qurt2bz7rrsG73lN8E2eiNvGtIXqv3GabW/Hea3acOBgCUJQWUDTRu0OmmwxzKbFN/UpNKeRaHlCqwZWjVAsmqA8TX8LIocq7Np7MmIBwt7EpEeZJxThcmC8DEJs9ClAjD+jlLIvMPXKC3JWCPgwCLGxHjy7ckSGFCSzbyPduh")

modelContext := &model.KopsModelContext{
Cluster: cluster,
InstanceGroups: instanceGroups,
SSHPublicKeys: [][]byte{sshPublicKey},
IAMModelContext: iam.IAMModelContext{Cluster: cluster},
InstanceGroups: instanceGroups,
SSHPublicKeys: [][]byte{sshPublicKey},
}
openstackModelContext := &OpenstackModelContext{
KopsModelContext: modelContext,
Expand Down
2 changes: 2 additions & 0 deletions upup/pkg/fi/cloudup/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ go_library(
"//pkg/model/components/node-authorizer:go_default_library",
"//pkg/model/domodel:go_default_library",
"//pkg/model/gcemodel:go_default_library",
"//pkg/model/iam:go_default_library",
"//pkg/model/openstackmodel:go_default_library",
"//pkg/model/spotinstmodel:go_default_library",
"//pkg/resources/digitalocean:go_default_library",
Expand Down Expand Up @@ -117,6 +118,7 @@ go_test(
"//pkg/diff:go_default_library",
"//pkg/kopscodecs:go_default_library",
"//pkg/model:go_default_library",
"//pkg/model/iam:go_default_library",
"//pkg/templates:go_default_library",
"//pkg/testutils:go_default_library",
"//pkg/testutils/golden:go_default_library",
Expand Down
5 changes: 3 additions & 2 deletions upup/pkg/fi/cloudup/apply_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import (
"k8s.io/kops/pkg/model/components/kubeapiserver"
"k8s.io/kops/pkg/model/domodel"
"k8s.io/kops/pkg/model/gcemodel"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/pkg/model/openstackmodel"
"k8s.io/kops/pkg/model/spotinstmodel"
"k8s.io/kops/pkg/resources/digitalocean"
Expand Down Expand Up @@ -359,8 +360,8 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
}

modelContext := &model.KopsModelContext{
Cluster: cluster,
InstanceGroups: c.InstanceGroups,
IAMModelContext: iam.IAMModelContext{Cluster: cluster},
InstanceGroups: c.InstanceGroups,
}

switch kops.CloudProviderID(cluster.Spec.CloudProvider) {
Expand Down
7 changes: 4 additions & 3 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"k8s.io/kops/pkg/client/simple/vfsclientset"
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/pkg/templates"
"k8s.io/kops/pkg/testutils"
"k8s.io/kops/pkg/testutils/golden"
Expand Down Expand Up @@ -93,15 +94,15 @@ func runChannelBuilderTest(t *testing.T, key string, addonManifests []string) {

tf := &TemplateFunctions{
KopsModelContext: model.KopsModelContext{
Cluster: cluster,
Region: "us-east-1",
IAMModelContext: iam.IAMModelContext{Cluster: cluster},
Region: "us-east-1",
},
}
tf.AddTo(templates.TemplateFunctions, secretStore)

bcb := BootstrapChannelBuilder{
KopsModelContext: &model.KopsModelContext{
Cluster: cluster,
IAMModelContext: iam.IAMModelContext{Cluster: cluster},
},
templates: templates,
assetBuilder: assets.NewAssetBuilder(cluster, ""),
Expand Down
3 changes: 2 additions & 1 deletion upup/pkg/fi/cloudup/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
kopsdns "k8s.io/kops/pkg/dns"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/pkg/model"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/upup/pkg/fi"
)

Expand Down Expand Up @@ -87,7 +88,7 @@ func findZone(cluster *kops.Cluster, cloud fi.Cloud) (dnsprovider.Zone, error) {

func validateDNS(cluster *kops.Cluster, cloud fi.Cloud) error {
kopsModelContext := &model.KopsModelContext{
Cluster: cluster,
IAMModelContext: iam.IAMModelContext{Cluster: cluster},
// We are not initializing a lot of the fields here; revisit once UsePrivateDNS is "real"
}

Expand Down