Skip to content

Commit

Permalink
stash changes for responder
Browse files Browse the repository at this point in the history
  • Loading branch information
xliuxu committed Sep 18, 2024
1 parent 2815123 commit e9f07cc
Show file tree
Hide file tree
Showing 12 changed files with 292 additions and 136 deletions.
9 changes: 6 additions & 3 deletions build/charts/antrea/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,10 @@ clientCAFile: ""
# -- To explicitly enable or disable a FeatureGate and bypass the Antrea
# defaults, add an entry to the dictionary with the FeatureGate's name as the
# key and a boolean as the value.
featureGates: {}
featureGates:
SecondaryNetwork: true
EgressSeparateSubnet: true
ServiceExternalIP: true

secondaryNetwork:
# -- Configuration of OVS bridges for secondary network. At the moment, at
Expand All @@ -215,7 +218,7 @@ secondaryNetwork:
# The following configuration specifies an OVS bridge with name "br1" and a
# physical interface "eth1":
# [{bridgeName: "br1", physicalInterfaces: ["eth1"]}]
ovsBridges: []
ovsBridges: [{bridgeName: "br-ext", physicalInterfaces: ["ens192"]}]

agent:
# -- Port for the antrea-agent APIServer to serve on.
Expand Down Expand Up @@ -418,7 +421,7 @@ webhooks:
enable: false

# -- Global log verbosity switch for all Antrea components.
logVerbosity: 0
logVerbosity: 4

# Configure Multicluster defaults for both Antrea Controller and Agent.
multicluster:
Expand Down
21 changes: 15 additions & 6 deletions build/yamls/antrea-aks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3775,10 +3775,10 @@ data:
# Enable support for provisioning secondary network interfaces for Pods (using
# Pod annotations). At the moment, Antrea can only create secondary network
# interfaces using SR-IOV VFs on baremetal Nodes.
# SecondaryNetwork: false
SecondaryNetwork: true
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable mirroring or redirecting the traffic Pods send or receive.
# TrafficControl: false
Expand All @@ -3800,7 +3800,7 @@ data:
# EgressTrafficShaping: false
# Allow users to allocate Egress IPs from a different subnet from the default Node subnet.
# EgressSeparateSubnet: false
EgressSeparateSubnet: true
# Allow users to apply ClusterNetworkPolicy to Kubernetes Nodes.
# NodeNetworkPolicy: false
Expand Down Expand Up @@ -4132,6 +4132,13 @@ data:
maxAge: 28
# Compress enables gzip compression on rotated files.
compress: true
secondaryNetwork:
# Configuration of OVS bridges for secondary network.
ovsBridges:
- bridgeName: br-ext
physicalInterfaces:
- ens192
antrea-cni.conflist: |
{
"cniVersion":"0.3.0",
Expand Down Expand Up @@ -4190,7 +4197,7 @@ data:
# AntreaIPAM: false
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable certificate-based authentication for IPSec tunnel.
# IPsecCertAuth: false
Expand Down Expand Up @@ -5138,7 +5145,7 @@ spec:
kubectl.kubernetes.io/default-container: antrea-agent
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: 4325a243ab510df539883b6384a30cf8b04ff862796444a6c5c10999159479c5
checksum/config: df9b9ac068f34f7812d5b4e2739d80cae908c24fdfe1cd3d1ae8b74038e22ef4
labels:
app: antrea
component: antrea-agent
Expand Down Expand Up @@ -5203,6 +5210,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down Expand Up @@ -5376,7 +5384,7 @@ spec:
annotations:
# Automatically restart Pod if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: 4325a243ab510df539883b6384a30cf8b04ff862796444a6c5c10999159479c5
checksum/config: df9b9ac068f34f7812d5b4e2739d80cae908c24fdfe1cd3d1ae8b74038e22ef4
labels:
app: antrea
component: antrea-controller
Expand Down Expand Up @@ -5414,6 +5422,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down
21 changes: 15 additions & 6 deletions build/yamls/antrea-eks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3775,10 +3775,10 @@ data:
# Enable support for provisioning secondary network interfaces for Pods (using
# Pod annotations). At the moment, Antrea can only create secondary network
# interfaces using SR-IOV VFs on baremetal Nodes.
# SecondaryNetwork: false
SecondaryNetwork: true
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable mirroring or redirecting the traffic Pods send or receive.
# TrafficControl: false
Expand All @@ -3800,7 +3800,7 @@ data:
# EgressTrafficShaping: false
# Allow users to allocate Egress IPs from a different subnet from the default Node subnet.
# EgressSeparateSubnet: false
EgressSeparateSubnet: true
# Allow users to apply ClusterNetworkPolicy to Kubernetes Nodes.
# NodeNetworkPolicy: false
Expand Down Expand Up @@ -4132,6 +4132,13 @@ data:
maxAge: 28
# Compress enables gzip compression on rotated files.
compress: true
secondaryNetwork:
# Configuration of OVS bridges for secondary network.
ovsBridges:
- bridgeName: br-ext
physicalInterfaces:
- ens192
antrea-cni.conflist: |
{
"cniVersion":"0.3.0",
Expand Down Expand Up @@ -4190,7 +4197,7 @@ data:
# AntreaIPAM: false
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable certificate-based authentication for IPSec tunnel.
# IPsecCertAuth: false
Expand Down Expand Up @@ -5138,7 +5145,7 @@ spec:
kubectl.kubernetes.io/default-container: antrea-agent
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: 4325a243ab510df539883b6384a30cf8b04ff862796444a6c5c10999159479c5
checksum/config: df9b9ac068f34f7812d5b4e2739d80cae908c24fdfe1cd3d1ae8b74038e22ef4
labels:
app: antrea
component: antrea-agent
Expand Down Expand Up @@ -5202,6 +5209,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down Expand Up @@ -5377,7 +5385,7 @@ spec:
annotations:
# Automatically restart Pod if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: 4325a243ab510df539883b6384a30cf8b04ff862796444a6c5c10999159479c5
checksum/config: df9b9ac068f34f7812d5b4e2739d80cae908c24fdfe1cd3d1ae8b74038e22ef4
labels:
app: antrea
component: antrea-controller
Expand Down Expand Up @@ -5415,6 +5423,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down
21 changes: 15 additions & 6 deletions build/yamls/antrea-gke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3775,10 +3775,10 @@ data:
# Enable support for provisioning secondary network interfaces for Pods (using
# Pod annotations). At the moment, Antrea can only create secondary network
# interfaces using SR-IOV VFs on baremetal Nodes.
# SecondaryNetwork: false
SecondaryNetwork: true
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable mirroring or redirecting the traffic Pods send or receive.
# TrafficControl: false
Expand All @@ -3800,7 +3800,7 @@ data:
# EgressTrafficShaping: false
# Allow users to allocate Egress IPs from a different subnet from the default Node subnet.
# EgressSeparateSubnet: false
EgressSeparateSubnet: true
# Allow users to apply ClusterNetworkPolicy to Kubernetes Nodes.
# NodeNetworkPolicy: false
Expand Down Expand Up @@ -4132,6 +4132,13 @@ data:
maxAge: 28
# Compress enables gzip compression on rotated files.
compress: true
secondaryNetwork:
# Configuration of OVS bridges for secondary network.
ovsBridges:
- bridgeName: br-ext
physicalInterfaces:
- ens192
antrea-cni.conflist: |
{
"cniVersion":"0.3.0",
Expand Down Expand Up @@ -4190,7 +4197,7 @@ data:
# AntreaIPAM: false
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable certificate-based authentication for IPSec tunnel.
# IPsecCertAuth: false
Expand Down Expand Up @@ -5138,7 +5145,7 @@ spec:
kubectl.kubernetes.io/default-container: antrea-agent
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: f5cf00de39a27790a7e158a3eca79123de415b3b09d389ac984b74027bbfaade
checksum/config: e456f36a1688b43563902aefd4176beacb27c2cf422ba4b8114a9bd3008048b4
labels:
app: antrea
component: antrea-agent
Expand Down Expand Up @@ -5201,6 +5208,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down Expand Up @@ -5374,7 +5382,7 @@ spec:
annotations:
# Automatically restart Pod if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: f5cf00de39a27790a7e158a3eca79123de415b3b09d389ac984b74027bbfaade
checksum/config: e456f36a1688b43563902aefd4176beacb27c2cf422ba4b8114a9bd3008048b4
labels:
app: antrea
component: antrea-controller
Expand Down Expand Up @@ -5412,6 +5420,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down
21 changes: 15 additions & 6 deletions build/yamls/antrea-ipsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3788,10 +3788,10 @@ data:
# Enable support for provisioning secondary network interfaces for Pods (using
# Pod annotations). At the moment, Antrea can only create secondary network
# interfaces using SR-IOV VFs on baremetal Nodes.
# SecondaryNetwork: false
SecondaryNetwork: true
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable mirroring or redirecting the traffic Pods send or receive.
# TrafficControl: false
Expand All @@ -3813,7 +3813,7 @@ data:
# EgressTrafficShaping: false
# Allow users to allocate Egress IPs from a different subnet from the default Node subnet.
# EgressSeparateSubnet: false
EgressSeparateSubnet: true
# Allow users to apply ClusterNetworkPolicy to Kubernetes Nodes.
# NodeNetworkPolicy: false
Expand Down Expand Up @@ -4145,6 +4145,13 @@ data:
maxAge: 28
# Compress enables gzip compression on rotated files.
compress: true
secondaryNetwork:
# Configuration of OVS bridges for secondary network.
ovsBridges:
- bridgeName: br-ext
physicalInterfaces:
- ens192
antrea-cni.conflist: |
{
"cniVersion":"0.3.0",
Expand Down Expand Up @@ -4203,7 +4210,7 @@ data:
# AntreaIPAM: false
# Enable managing external IPs of Services of LoadBalancer type.
# ServiceExternalIP: false
ServiceExternalIP: true
# Enable certificate-based authentication for IPSec tunnel.
# IPsecCertAuth: false
Expand Down Expand Up @@ -5151,7 +5158,7 @@ spec:
kubectl.kubernetes.io/default-container: antrea-agent
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: 9e94f199d125877d889ba73e053c95b342e89323d0423cde074ae074df379494
checksum/config: 2cfdb37189d8d11400fc7fba1370ed433b125f161c032bd00b66863dce9d494a
checksum/ipsec-secret: d0eb9c52d0cd4311b6d252a951126bf9bea27ec05590bed8a394f0f792dcb2a4
labels:
app: antrea
Expand Down Expand Up @@ -5215,6 +5222,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down Expand Up @@ -5433,7 +5441,7 @@ spec:
annotations:
# Automatically restart Pod if the ConfigMap changes
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
checksum/config: 9e94f199d125877d889ba73e053c95b342e89323d0423cde074ae074df379494
checksum/config: 2cfdb37189d8d11400fc7fba1370ed433b125f161c032bd00b66863dce9d494a
labels:
app: antrea
component: antrea-controller
Expand Down Expand Up @@ -5471,6 +5479,7 @@ spec:
- "--alsologtostderr"
- "--log_file_max_size=100"
- "--log_file_max_num=4"
- "--v=4"
env:
# Provide pod and node information for clusterinformation CRD.
- name: POD_NAME
Expand Down
Loading

0 comments on commit e9f07cc

Please sign in to comment.