Skip to content

Add platform-config-delete-event-age param. #1389

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

Open
maheshkurund wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add platform-config-delete-event-age param. #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions doc/features/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,9 @@ registry:
# aci_multipod_ubuntu: True #override if inter-pod migration is to be done on a setup with Ubuntu nodes, default is False (Used only for rke)
# dhcp_renew_max_retry_count: 10 #max number of times dhcp renew should be executed before giving up
# dhcp_delay: 10 #delay between dhcp release and dhcp renew in seconds
# platform_config_delete_event_age: 60 # Aging time for the platform config delete event in seconds, default is 120 seconds.
# This helps to detect intra-pod migration
# when controller fails to receive opflexOdev create notification from APIC.
# hpp_optimization: True #override if needed, default is False
# disable_hpp_rendering: False # set to true to disable HPP rendering which disables k8s network policies functionality, default is false
# no_wait_for_service_ep_readiness: True #override if needed, default is False
Expand Down
11 changes: 10 additions & 1 deletion provision/acc_provision/templates/aci-containers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3041,6 +3041,9 @@ data:
{% if config.kube_config.dhcp_delay %}
"dhcp-delay": {{ config.kube_config.dhcp_delay|json}},
{% endif %}
{% if config.kube_config.platform_config_delete_event_age %}
"platform-config-delete-event-age": {{ config.kube_config.platform_config_delete_event_age|json}},
{% endif %}
{% if config.kube_config.epg_resolve_prioritize %}
"epg-resolve-prioritize": {{config.kube_config.epg_resolve_prioritize|json}},
{% endif %}
Expand Down Expand Up @@ -3146,7 +3149,13 @@ data:
"level": {{config.logging.opflexagent_log_level|json}}
},
"opflex": {
"notif" : { "enabled" : "false" },
"notif" : {
{% if config.kube_config.aci_multipod %}
"enabled": {{config.kube_config.aci_multipod|json}}
{% else %}
"enabled": false
{% endif %}
},
"startup": {
"enabled": {{ config.kube_config.opflex_startup_enabled|json }},
"policy-file": {{ config.kube_config.opflex_startup_policy_file|json }},
Expand Down
7 changes: 5 additions & 2 deletions provision/acc_provision/templates/provision-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ registry:
# aci_multipod_ubuntu: True #override if inter-pod migration is to be done on a setup with Ubuntu nodes, default is False (Used only for rke)
# dhcp_renew_max_retry_count: 10 #max number of times dhcp renew should be executed before giving up
# dhcp_delay: 10 #delay between dhcp release and dhcp renew in seconds
# platform_config_delete_event_age: 60 # Aging time for the platform config delete event in seconds.
# Default is 120 seconds. This helps to detect intra-pod migration
# when controller fails to receive opflexODev create notification from APIC.
# hpp_optimization: True #override if needed, default is False
# disable_hpp_rendering: False # set to true to disable HPP rendering which disables k8s network policies functionality, default is false
# no_wait_for_service_ep_readiness: True #override if needed, default is False
Expand Down Expand Up @@ -133,8 +136,8 @@ registry:
# labels:
# - infra
# - router
#opflex_mode: "" #override if needed, supported modes are "physical", "dpu" and "overlay"
#opflex_agent_prometheus: "true" # Set to "true" if enabling opflex-agent prometheus metrics, default is "false"
# opflex_mode: "" #override if needed, supported modes are "physical", "dpu" and "overlay"
# opflex_agent_prometheus: "true" # Set to "true" if enabling opflex-agent prometheus metrics, default is "false"
# opflex_agent_opflex_asyncjson_enabled": "false" # set to "true" for enabling opflex-agent opflex asyncjson, default is "false"
# opflex_agent_ovs_asyncjson_enabled: "false" # set to "true" for enabling opflex-agent ovs asyncjson, default is "false"
# opflex_agent_policy_retry_delay_timer: 60 # set opflex agent policy retry delay time, value in seconds, default=10, min=1
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/acc_provision_operator_exclude.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/base_case.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/base_case_ipv6.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion provision/testdata/base_case_operator_cr.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/base_case_operator_mode.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/base_case_snat.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion provision/testdata/base_case_tar/cluster-network-22-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions provision/testdata/base_case_tar/cluster-network-24-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ data:
\n } },\n \"enable-drop-log\": true,\n \"enable-nodepodif\"\
: false,\n \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/base_case_upgrade.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/dualstack_base.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/dualstack_extern_dynamic.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/dualstack_extern_static.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/dualstack_node_subnet.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/dualstack_only_ipv4.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/dualstack_pod_and_node_subnet.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/enable_aci_cilium_chaining.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/enable_opflex_agent_prometheus.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_24.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_25.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_26.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_27.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_28.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_29.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_30.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_31.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_32.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_RKE2_kubernetes_1_33.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_dockerucp.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_k8s_aci_cilium.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../testdata/flavor_k8s_aci_cilium_tar/cluster-network-22-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...estdata/flavor_k8s_aci_cilium_tar/cluster-network-24-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ data:
\n } },\n \"enable-drop-log\": true,\n \"enable-nodepodif\"\
: false,\n \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
4 changes: 3 additions & 1 deletion provision/testdata/flavor_localhost.kube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,9 @@ data:
"level": "debug"
},
"opflex": {
"notif" : { "enabled" : "false" },
"notif" : {
"enabled": false
},
"startup": {
"enabled": false,
"policy-file": "/usr/local/var/lib/opflex-agent-ovs/startup/pol.json",
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_310.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_311.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_410_baremetal.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../flavor_openshift_410_baremetal_tar/cluster-network-23-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...lavor_openshift_410_baremetal_tar/cluster-network-25-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@ data:
\ },\n \"enable-drop-log\": true,\n \"enable-nodepodif\": false,\n \
\ \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_410_esx.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...stdata/flavor_openshift_410_esx_tar/cluster-network-23-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...data/flavor_openshift_410_esx_tar/cluster-network-25-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ data:
\ },\n \"enable-drop-log\": true,\n \"enable-nodepodif\": false,\n \
\ \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_410_esx_vDS_6_6_above.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...openshift_410_esx_vDS_6_6_above_tar/cluster-network-23-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...enshift_410_esx_vDS_6_6_above_tar/cluster-network-25-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ data:
\ },\n \"enable-drop-log\": true,\n \"enable-nodepodif\": false,\n \
\ \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_410_openstack.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../flavor_openshift_410_openstack_tar/cluster-network-23-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...lavor_openshift_410_openstack_tar/cluster-network-25-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@ data:
\ },\n \"enable-drop-log\": true,\n \"enable-nodepodif\": false,\n \
\ \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_411_baremetal.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../flavor_openshift_411_baremetal_tar/cluster-network-23-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...lavor_openshift_411_baremetal_tar/cluster-network-25-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ data:
\n } },\n \"enable-drop-log\": true,\n \"enable-nodepodif\"\
: false,\n \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_411_esx.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...stdata/flavor_openshift_411_esx_tar/cluster-network-23-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...data/flavor_openshift_411_esx_tar/cluster-network-25-ConfigMap-aci-containers-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@ data:
\n } },\n \"enable-drop-log\": true,\n \"enable-nodepodif\"\
: false,\n \"enable-ovs-hw-offload\": false\n}"
opflex-agent-config: "{\n \"log\": {\n \"level\": \"info\"\n },\n \
\ \"opflex\": {\n \"notif\" : { \"enabled\" : \"false\" },\n \"\
startup\": {\n \"enabled\": false,\n \"policy-file\"\
: \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\",\n \"\
policy-duration\": 60,\n \"resolve-aft-conn\": false\n },\n\
\ \"timers\" : {\n \"switch-sync-delay\": 5,\n \
\ \"switch-sync-dynamic\": 10\n },\n \"asyncjson\": { \"enabled\"\
\ : \"false\" },\n \"force-ep-undeclares\": { \"enabled\": \"true\" }\n\
\ ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n },\n \"\
ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n },\n \"prometheus\"\
: {\n \"enabled\": \"false\"\n }\n}"
\ \"opflex\": {\n \"notif\" : {\n \"enabled\": false\n \
\ },\n \"startup\": {\n \"enabled\": false,\n \
\ \"policy-file\": \"/usr/local/var/lib/opflex-agent-ovs/startup/pol.json\"\
,\n \"policy-duration\": 60,\n \"resolve-aft-conn\"\
: false\n },\n \"timers\" : {\n \"switch-sync-delay\"\
: 5,\n \"switch-sync-dynamic\": 10\n },\n \"asyncjson\"\
: { \"enabled\" : \"false\" },\n \"force-ep-undeclares\": { \"enabled\"\
: \"true\" }\n ,\"epg-resolve-prioritize\": { \"enabled\": \"true\" }\n\
\ },\n \"ovs\": {\n \"asyncjson\": { \"enabled\" : \"false\" }\n\
\ },\n \"prometheus\": {\n \"enabled\": \"false\"\n }\n}"
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 4 additions & 2 deletions provision/testdata/flavor_openshift_411_esx_vDS_6_6_above.kube.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...openshift_411_esx_vDS_6_6_above_tar/cluster-network-23-ConfigMap-aci-operator-config.yaml
View file
Open in desktop

Large diffs are not rendered by default.

Loading