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

Merge pull request #11666 from rifelpet/lifecycle 

Add more lifecycles to HasLifecycle tasks
This commit is contained in:
Kubernetes Prow Robot 2021-06-01 22:20:38 -07:00 committed by GitHub
parent 1f4ccb6679 efef53cb2a
commit 6f81fe65c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/model/awsmodel/spotinst.go
View File

@ -506,9 +506,10 @@ func (b *SpotInstanceGroupModelBuilder) buildLaunchSpec(c *fi.ModelBuilderContex
ig, igOcean *kops.InstanceGroup, ocean *spotinsttasks.Ocean) (err error) { ig, igOcean *kops.InstanceGroup, ocean *spotinsttasks.Ocean) (err error) {
klog.V(4).Infof("Building instance group as LaunchSpec: %q", b.AutoscalingGroupName(ig)) klog.V(4).Infof("Building instance group as LaunchSpec: %q", b.AutoscalingGroupName(ig))
launchSpec := &spotinsttasks.LaunchSpec{ launchSpec := &spotinsttasks.LaunchSpec{
Name: fi.String(b.AutoscalingGroupName(ig)), Name: fi.String(b.AutoscalingGroupName(ig)),
ImageID: fi.String(ig.Spec.Image), Lifecycle: b.Lifecycle,
Ocean: ocean, // link to Ocean ImageID: fi.String(ig.Spec.Image),
Ocean: ocean, // link to Ocean
} }
// Instance types and strategy. // Instance types and strategy.

19
pkg/model/pki.go
View File

@ -131,10 +131,11 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error {
if b.KopsModelContext.Cluster.Spec.Networking.Kuberouter != nil && !b.UseKopsControllerForNodeBootstrap() { if b.KopsModelContext.Cluster.Spec.Networking.Kuberouter != nil && !b.UseKopsControllerForNodeBootstrap() {
t := &fitasks.Keypair{ t := &fitasks.Keypair{
Name: fi.String("kube-router"), Name: fi.String("kube-router"),
Subject: "cn=" + rbac.KubeRouter, Lifecycle: b.Lifecycle,
Type: "client", Subject: "cn=" + rbac.KubeRouter,
Signer: defaultCA, Type: "client",
Signer: defaultCA,
} }
c.AddTask(t) c.AddTask(t)
} }
@ -177,6 +178,7 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error {
// @note: the certificate used by the node authorizers // @note: the certificate used by the node authorizers
c.AddTask(&fitasks.Keypair{ c.AddTask(&fitasks.Keypair{
Name: fi.String("node-authorizer"), Name: fi.String("node-authorizer"),
Lifecycle: b.Lifecycle,
Subject: "cn=node-authorizaer", Subject: "cn=node-authorizaer",
Type: "server", Type: "server",
AlternateNames: alternateNames, AlternateNames: alternateNames,
@ -185,10 +187,11 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error {
// @note: we use this for mutual tls between node and authorizer // @note: we use this for mutual tls between node and authorizer
c.AddTask(&fitasks.Keypair{ c.AddTask(&fitasks.Keypair{
Name: fi.String("node-authorizer-client"), Name: fi.String("node-authorizer-client"),
Subject: "cn=node-authorizer-client", Lifecycle: b.Lifecycle,
Type: "client", Subject: "cn=node-authorizer-client",
Signer: defaultCA, Type: "client",
Signer: defaultCA,
}) })
} }