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

Merge pull request #12872 from johngmyers/imagename 

Rename imageName to image in v1alpha3
This commit is contained in:
Kubernetes Prow Robot 2021-12-02 02:01:33 -08:00 committed by GitHub
parent db3167215e 8a5cbc0ff7
commit fbfbb1328a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/kops/networking.go
View File

@ -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"`
}

4
pkg/apis/kops/v1alpha2/networking.go
View File

@ -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"`
}

8
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -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))

8
pkg/apis/kops/v1alpha3/networking.go
View File

@ -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"`
}

8
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -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))

4
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View File

@ -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