Skip to content
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

Jump to bottom

Fix merge conflicts from release-1.18 to master #2881

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Fix merge conflicts from release-1.18 to master #2881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b46e703
Update changelogs and charts for v1.18.0 release (#2858)
jchen6585 Mar 29, 2024
635389d
Fix merge conflicts
Apr 17, 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: 2 additions & 2 deletions config/master/aws-k8s-cni-cn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,12 @@ spec:
value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.0"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
4 changes: 2 additions & 2 deletions config/master/aws-k8s-cni-us-gov-east-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,12 @@ spec:
value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.0"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
4 changes: 2 additions & 2 deletions config/master/aws-k8s-cni-us-gov-west-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,12 @@ spec:
value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.0"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
4 changes: 2 additions & 2 deletions config/master/aws-k8s-cni.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,12 @@ spec:
value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.0"
- name: ENABLE_SUBNET_DISCOVERY
value: "true"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
Loading