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

Move sshkey to awsmodel

This commit is contained in:
Ciprian Hacman 2021-04-30 11:35:33 +03:00
parent c49b71feb5
commit ca02c04793
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/sshkey.go → pkg/model/awsmodel/sshkey.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package model package awsmodel
import ( import (
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
@ -23,7 +23,7 @@ import (
// SSHKeyModelBuilder configures SSH objects // SSHKeyModelBuilder configures SSH objects
type SSHKeyModelBuilder struct { type SSHKeyModelBuilder struct {
*KopsModelContext *AWSModelContext
Lifecycle *fi.Lifecycle Lifecycle *fi.Lifecycle
} }

2
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -552,7 +552,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
&awsmodel.DNSModelBuilder{KopsModelContext: modelContext, Lifecycle: &clusterLifecycle}, &awsmodel.DNSModelBuilder{KopsModelContext: modelContext, Lifecycle: &clusterLifecycle},
&awsmodel.ExternalAccessModelBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle}, &awsmodel.ExternalAccessModelBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle},
&model.FirewallModelBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle}, &model.FirewallModelBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle},
&model.SSHKeyModelBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle}, &awsmodel.SSHKeyModelBuilder{AWSModelContext: awsModelContext, Lifecycle: &securityLifecycle},
&model.NetworkModelBuilder{KopsModelContext: modelContext, Lifecycle: &networkLifecycle}, &model.NetworkModelBuilder{KopsModelContext: modelContext, Lifecycle: &networkLifecycle},
&model.IAMModelBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle, Cluster: cluster}, &model.IAMModelBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle, Cluster: cluster},
&awsmodel.OIDCProviderBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle, KeyStore: keyStore}, &awsmodel.OIDCProviderBuilder{KopsModelContext: modelContext, Lifecycle: &securityLifecycle, KeyStore: keyStore},