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

Add new API field for VPC CNI's network policy agent image

This commit is contained in:
Peter Rifel 2024-07-17 20:45:36 -05:00
parent ae8fa06e07
commit f639cb5bd8
No known key found for this signature in database
6 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4856,6 +4856,10 @@ spec:
description: InitImageName is the init container image name description: InitImageName is the init container image name
to use. to use.
type: string type: string
networkPolicyAgentImage:
description: NetworkPolicyAgentImage is the container image
to use for the network policy agent
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

@ -316,6 +316,8 @@ type AmazonVPCNetworkingSpec struct {
Image string `json:"image,omitempty"` Image string `json:"image,omitempty"`
// InitImage is the init container image name to use. // InitImage is the init container image name to use.
InitImage string `json:"initImage,omitempty"` InitImage string `json:"initImage,omitempty"`
// NetworkPolicyAgentImage is the container image to use for the network policy agent
NetworkPolicyAgentImage string `json:"networkPolicyAgentImage,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

@ -281,6 +281,8 @@ type AmazonVPCNetworkingSpec struct {
Image string `json:"imageName,omitempty"` Image string `json:"imageName,omitempty"`
// InitImageName is the init container image name to use. // InitImageName is the init container image name to use.
InitImage string `json:"initImageName,omitempty"` InitImage string `json:"initImageName,omitempty"`
// NetworkPolicyAgentImage is the container image to use for the network policy agent
NetworkPolicyAgentImage string `json:"networkPolicyAgentImage,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

@ -1504,6 +1504,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.Image = in.Image out.Image = in.Image
out.InitImage = in.InitImage out.InitImage = in.InitImage
out.NetworkPolicyAgentImage = in.NetworkPolicyAgentImage
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))
@ -1526,6 +1527,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.Image = in.Image out.Image = in.Image
out.InitImage = in.InitImage out.InitImage = in.InitImage
out.NetworkPolicyAgentImage = in.NetworkPolicyAgentImage
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
pkg/apis/kops/v1alpha3/networking.go
View File

@ -286,6 +286,8 @@ type AmazonVPCNetworkingSpec struct {
Image string `json:"image,omitempty"` Image string `json:"image,omitempty"`
// InitImage is the init container image name to use. // InitImage is the init container image name to use.
InitImage string `json:"initImage,omitempty"` InitImage string `json:"initImage,omitempty"`
// NetworkPolicyAgentImage is the container image to use for the network policy agent
NetworkPolicyAgentImage string `json:"networkPolicyAgentImage,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/v1alpha3/zz_generated.conversion.go generated
View File

@ -1664,6 +1664,7 @@ func Convert_kops_AlwaysAllowAuthorizationSpec_To_v1alpha3_AlwaysAllowAuthorizat
func autoConvert_v1alpha3_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in *AmazonVPCNetworkingSpec, out *kops.AmazonVPCNetworkingSpec, s conversion.Scope) error { func autoConvert_v1alpha3_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in *AmazonVPCNetworkingSpec, out *kops.AmazonVPCNetworkingSpec, s conversion.Scope) error {
out.Image = in.Image out.Image = in.Image
out.InitImage = in.InitImage out.InitImage = in.InitImage
out.NetworkPolicyAgentImage = in.NetworkPolicyAgentImage
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))
@ -1686,6 +1687,7 @@ func Convert_v1alpha3_AmazonVPCNetworkingSpec_To_kops_AmazonVPCNetworkingSpec(in
func autoConvert_kops_AmazonVPCNetworkingSpec_To_v1alpha3_AmazonVPCNetworkingSpec(in *kops.AmazonVPCNetworkingSpec, out *AmazonVPCNetworkingSpec, s conversion.Scope) error { func autoConvert_kops_AmazonVPCNetworkingSpec_To_v1alpha3_AmazonVPCNetworkingSpec(in *kops.AmazonVPCNetworkingSpec, out *AmazonVPCNetworkingSpec, s conversion.Scope) error {
out.Image = in.Image out.Image = in.Image
out.InitImage = in.InitImage out.InitImage = in.InitImage
out.NetworkPolicyAgentImage = in.NetworkPolicyAgentImage
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))