From 8a5cbc0ff7836015af853b3e16336b4881205d27 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Tue, 30 Nov 2021 19:09:33 -0800 Subject: [PATCH] Rename imageName to image in v1alpha3 --- pkg/apis/kops/networking.go | 8 ++++---- pkg/apis/kops/v1alpha2/networking.go | 4 ++-- pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 8 ++++---- pkg/apis/kops/v1alpha3/networking.go | 8 ++++---- pkg/apis/kops/v1alpha3/zz_generated.conversion.go | 8 ++++---- .../k8s-1.16.yaml.template | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go index 50ae7d083b..f50c07d167 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -248,10 +248,10 @@ type RomanaNetworkingSpec struct { // AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking type AmazonVPCNetworkingSpec struct { - // ImageName is the container image name to use. - ImageName string `json:"imageName,omitempty"` - // InitImageName is the init container image name to use. - InitImageName string `json:"initImageName,omitempty"` + // Image is the container image name to use. + Image string `json:"image,omitempty"` + // InitImage is the init container image name to use. + InitImage string `json:"initImage,omitempty"` // Env is a list of environment variables to set in the container. Env []EnvVar `json:"env,omitempty"` } diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go index 921b11171d..341e60ac19 100644 --- a/pkg/apis/kops/v1alpha2/networking.go +++ b/pkg/apis/kops/v1alpha2/networking.go @@ -258,9 +258,9 @@ type RomanaNetworkingSpec struct { // AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking type AmazonVPCNetworkingSpec struct { // ImageName is the container image name to use. - ImageName string `json:"imageName,omitempty"` + Image string `json:"imageName,omitempty"` // InitImageName is the init container image name to use. - InitImageName string `json:"initImageName,omitempty"` + InitImage string `json:"initImageName,omitempty"` // Env is a list of environment variables to set in the container. Env []EnvVar `json:"env,omitempty"` } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 2c6ff54b2e..3996a4e8e0 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -1430,8 +1430,8 @@ func Convert_kops_AlwaysAllowAuthorizationSpec_To_v1alpha2_AlwaysAllowAuthorizat } func autoConvert_v1alpha2_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in *AmazonVPCNetworkingSpec, out *kops.AmazonVPCNetworkingSpec, s conversion.Scope) error { - out.ImageName = in.ImageName - out.InitImageName = in.InitImageName + out.Image = in.Image + out.InitImage = in.InitImage if in.Env != nil { in, out := &in.Env, &out.Env *out = make([]kops.EnvVar, len(*in)) @@ -1452,8 +1452,8 @@ func Convert_v1alpha2_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in } func autoConvert_kops_AmazonVPCNetworkingSpec_To_v1alpha2_AmazonVPCNetworkingSpec(in *kops.AmazonVPCNetworkingSpec, out *AmazonVPCNetworkingSpec, s conversion.Scope) error { - out.ImageName = in.ImageName - out.InitImageName = in.InitImageName + out.Image = in.Image + out.InitImage = in.InitImage if in.Env != nil { in, out := &in.Env, &out.Env *out = make([]EnvVar, len(*in)) diff --git a/pkg/apis/kops/v1alpha3/networking.go b/pkg/apis/kops/v1alpha3/networking.go index 9da56c7b92..37dbc8642a 100644 --- a/pkg/apis/kops/v1alpha3/networking.go +++ b/pkg/apis/kops/v1alpha3/networking.go @@ -238,10 +238,10 @@ type KuberouterNetworkingSpec struct{} // AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking type AmazonVPCNetworkingSpec struct { - // ImageName is the container image name to use. - ImageName string `json:"imageName,omitempty"` - // InitImageName is the init container image name to use. - InitImageName string `json:"initImageName,omitempty"` + // Image is the container image name to use. + Image string `json:"image,omitempty"` + // InitImage is the init container image name to use. + InitImage string `json:"initImage,omitempty"` // Env is a list of environment variables to set in the container. Env []EnvVar `json:"env,omitempty"` } diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 9f553cd9ae..50ce08a4dc 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -1380,8 +1380,8 @@ func Convert_kops_AlwaysAllowAuthorizationSpec_To_v1alpha3_AlwaysAllowAuthorizat } func autoConvert_v1alpha3_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in *AmazonVPCNetworkingSpec, out *kops.AmazonVPCNetworkingSpec, s conversion.Scope) error { - out.ImageName = in.ImageName - out.InitImageName = in.InitImageName + out.Image = in.Image + out.InitImage = in.InitImage if in.Env != nil { in, out := &in.Env, &out.Env *out = make([]kops.EnvVar, len(*in)) @@ -1402,8 +1402,8 @@ func Convert_v1alpha3_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in } func autoConvert_kops_AmazonVPCNetworkingSpec_To_v1alpha3_AmazonVPCNetworkingSpec(in *kops.AmazonVPCNetworkingSpec, out *AmazonVPCNetworkingSpec, s conversion.Scope) error { - out.ImageName = in.ImageName - out.InitImageName = in.InitImageName + out.Image = in.Image + out.InitImage = in.InitImage if in.Env != nil { in, out := &in.Env, &out.Env *out = make([]EnvVar, len(*in)) diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template index 819fd2e477..b6e6a88955 100644 --- a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template @@ -109,7 +109,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: "{{- or .Networking.AmazonVPC.InitImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1" }}" + image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1" }}" imagePullPolicy: Always env: - name: DISABLE_TCP_EARLY_DEMUX @@ -131,7 +131,7 @@ spec: {} containers: - name: aws-node - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1" }}" + image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1" }}" imagePullPolicy: Always ports: - containerPort: 61678