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.

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

Add kubeAPIServerOverride option to antrea-controller #5056

Merged
merged 1 commit into from
Jun 2, 2023

Conversation

tnqn
Copy link
Member

@tnqn tnqn commented May 30, 2023

To override the address of Kubernetes apiserver for antrea-controller, the option, kubeAPIServerOverride, is added to antrea-controller.conf. It's typically used when kube-proxy is not deployed (substituted by AntreaProxy) and kube-controller-manager does not run NodeIPAMController (substituted by Antrea NodeIPAM).

Fixes #5022

// It is typically used when kube-proxy is not deployed (substituted by AntreaProxy) and kube-controller-manager
// does not run NodeIPAMController (substituted by Antrea NodeIPAM).
// Defaults to "". It must be a host string, a host:port pair, or a URL to the base of the apiserver.
KubeAPIServerOverride string `yaml:"kubeAPIServerOverride,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we reflect this change in a doc?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated docs/antrea-ipam.md

@luolanzone luolanzone added the action/release-note Indicates a PR that should be included in release notes. label May 31, 2023
luolanzone
luolanzone previously approved these changes May 31, 2023
Copy link
Contributor

@luolanzone luolanzone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one question

luolanzone
luolanzone previously approved these changes May 31, 2023
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ANTREA_LOG_DIR=$PWD/log ANTREA_COV_DIR=$PWD/test-e2e-encap-all-features-enabled-coverage ./ci/kind/test-e2e-kind.sh \
--encap-mode encap \
--coverage \
--feature-gates AllAlpha=true,AllBeta=true,FlowExporter=false \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we can remove FlowExporter=false now that #5021 has been merged
(and remove the comment above)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@@ -239,6 +239,7 @@ nodePortLocal:
{{- end }}

# Provide the address of Kubernetes apiserver, to override any value provided in kubeconfig or InClusterConfig.
# It is typically used when kube-proxy is not deployed (substituted by AntreaProxy).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/substituted by AntreaProxy/replaced by AntreaProxy

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

To override the address of Kubernetes apiserver for antrea-controller,
the option, kubeAPIServerOverride, is added to antrea-controller.conf.
It's typically used when kube-proxy is not deployed (substituted by
AntreaProxy) and kube-controller-manager does not run NodeIPAMController
(substituted by Antrea NodeIPAM).

Signed-off-by: Quan Tian <[email protected]>
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tnqn
Copy link
Member Author

tnqn commented Jun 2, 2023

/skip-all

@tnqn tnqn merged commit e654745 into antrea-io:main Jun 2, 2023
@tnqn tnqn deleted the apiserver-override branch June 2, 2023 02:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
action/release-note Indicates a PR that should be included in release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

proxyAll (no kube-proxy) and Antrea NodeIPAM cannot be enabled at the same time
3 participants