Skip to content

Automated cherry pick of #16681: Add new API field for VPC CNI's network policy agent #16689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 18, 2024
Merged

Automated cherry pick of #16681: Add new API field for VPC CNI's network policy agent #16689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e39ad3
Add new API field for VPC CNI's network policy agent image
rifelpet Jul 18, 2024
a9638b2
Allow network policy agent image to be overridden
rifelpet Jul 18, 2024
b863ee7
Add integration test for VPC CNI image fields
rifelpet Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4905,6 +4905,10 @@ spec:
description: InitImageName is the init container image name
to use.
type: string
networkPolicyAgentImage:
description: NetworkPolicyAgentImage is the container image
to use for the network policy agent
type: string
type: object
calico:
description: CalicoNetworkingSpec declares that we want Calico
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ type AmazonVPCNetworkingSpec struct {
Image string `json:"image,omitempty"`
// InitImage is the init container image name to use.
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 []EnvVar `json:"env,omitempty"`
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,8 @@ type AmazonVPCNetworkingSpec struct {
Image string `json:"imageName,omitempty"`
// InitImageName is the init container image name to use.
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 []EnvVar `json:"env,omitempty"`
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha3/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,8 @@ type AmazonVPCNetworkingSpec struct {
Image string `json:"image,omitempty"`
// InitImage is the init container image name to use.
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 []EnvVar `json:"env,omitempty"`
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion ...egration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,10 @@ spec:
enabled: true
networkCIDR: 172.20.0.0/16
networking:
amazonvpc: {}
amazonvpc:
imageName: image:123
initImageName: initimage:123
networkPolicyAgentImage: networkpolicyagentimage:123
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
2 changes: 1 addition & 1 deletion ...e_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 516820e30ab3bc0817c018c36ffd1841d5e6c53b553a0ddd8ae98d7d3779c0fc
manifestHash: 84642ad9b609d8e6ce59cbd1bd599e9410416c1619f4734112e1b338c4c4b469
name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector:
Expand Down
6 changes: 3 additions & 3 deletions ...ws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ spec:
fieldPath: metadata.name
- name: CLUSTER_NAME
value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.1
image: image:123
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -570,7 +570,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.1
image: networkpolicyagentimage:123
name: aws-eks-nodeagent
resources:
requests:
Expand All @@ -596,7 +596,7 @@ spec:
value: "false"
- name: ENABLE_IPv6
value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.1
image: initimage:123
name: aws-vpc-cni-init
resources:
requests:
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ spec:
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
networking:
amazonvpc: {}
amazonvpc:
imageName: image:123
initImageName: initimage:123
networkPolicyAgentImage: networkpolicyagentimage:123
nodeTerminationHandler:
enabled: true
enableRebalanceDraining: true
Expand Down
2 changes: 1 addition & 1 deletion upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ spec:
- mountPath: /run/xtables.lock
name: xtables-lock
- name: aws-eks-nodeagent
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.1
image: "{{- or .Networking.AmazonVPC.NetworkPolicyAgentImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.1" }}"
env:
- name: MY_NODE_NAME
valueFrom:
Expand Down