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

add init image field

This commit is contained in:
Ryan Dyer 2021-05-25 16:45:55 +00:00
parent 6d6508738f
commit 65b750e732
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -3150,6 +3150,9 @@ spec:
imageName: imageName:
description: The container image name to use description: The container image name to use
type: string type: string
initImageName:
description: The init container image name to use
type: string
type: object type: object
calico: calico:
description: CalicoNetworkingSpec declares that we want Calico description: CalicoNetworkingSpec declares that we want Calico

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

@ -250,6 +250,8 @@ type RomanaNetworkingSpec struct {
type AmazonVPCNetworkingSpec struct { type AmazonVPCNetworkingSpec struct {
// The container image name to use // The container image name to use
ImageName string `json:"imageName,omitempty"` ImageName string `json:"imageName,omitempty"`
// The init container image name to use
InitImageName string `json:"initImageName,omitempty"`
// Env is a list of environment variables to set in the container. // Env is a list of environment variables to set in the container.
Env []EnvVar `json:"env,omitempty"` Env []EnvVar `json:"env,omitempty"`
} }

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

@ -250,6 +250,8 @@ type RomanaNetworkingSpec struct {
type AmazonVPCNetworkingSpec struct { type AmazonVPCNetworkingSpec struct {
// The container image name to use // The container image name to use
ImageName string `json:"imageName,omitempty"` ImageName string `json:"imageName,omitempty"`
// The init container image name to use
InitImageName string `json:"initImageName,omitempty"`
// Env is a list of environment variables to set in the container. // Env is a list of environment variables to set in the container.
Env []EnvVar `json:"env,omitempty"` Env []EnvVar `json:"env,omitempty"`
} }

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

@ -1268,6 +1268,7 @@ func Convert_kops_AlwaysAllowAuthorizationSpec_To_v1alpha2_AlwaysAllowAuthorizat
func autoConvert_v1alpha2_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in *AmazonVPCNetworkingSpec, out *kops.AmazonVPCNetworkingSpec, s conversion.Scope) error { func autoConvert_v1alpha2_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in *AmazonVPCNetworkingSpec, out *kops.AmazonVPCNetworkingSpec, s conversion.Scope) error {
out.ImageName = in.ImageName out.ImageName = in.ImageName
out.InitImageName = in.InitImageName
if in.Env != nil { if in.Env != nil {
in, out := &in.Env, &out.Env in, out := &in.Env, &out.Env
*out = make([]kops.EnvVar, len(*in)) *out = make([]kops.EnvVar, len(*in))
@ -1289,6 +1290,7 @@ func Convert_v1alpha2_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in
func autoConvert_kops_AmazonVPCNetworkingSpec_To_v1alpha2_AmazonVPCNetworkingSpec(in *kops.AmazonVPCNetworkingSpec, out *AmazonVPCNetworkingSpec, s conversion.Scope) error { func autoConvert_kops_AmazonVPCNetworkingSpec_To_v1alpha2_AmazonVPCNetworkingSpec(in *kops.AmazonVPCNetworkingSpec, out *AmazonVPCNetworkingSpec, s conversion.Scope) error {
out.ImageName = in.ImageName out.ImageName = in.ImageName
out.InitImageName = in.InitImageName
if in.Env != nil { if in.Env != nil {
in, out := &in.Env, &out.Env in, out := &in.Env, &out.Env
*out = make([]EnvVar, len(*in)) *out = make([]EnvVar, len(*in))

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

@ -191,7 +191,7 @@
- "env": - "env":
- "name": "DISABLE_TCP_EARLY_DEMUX" - "name": "DISABLE_TCP_EARLY_DEMUX"
"value": "false" "value": "false"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.10" "image": "{{- or .Networking.AmazonVPC.InitImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.10" }}"
"imagePullPolicy": "Always" "imagePullPolicy": "Always"
"name": "aws-vpc-cni-init" "name": "aws-vpc-cni-init"
"securityContext": "securityContext":