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

Rebase from master #378

Merged
merged 2 commits into from Oct 22, 2020
Merged

Conversation

dulek
Copy link
Contributor

@dulek dulek commented Oct 22, 2020

No description provided.

TabbieD and others added 2 commits October 21, 2020 16:06
The kuryr-cni.conf file was removed and is no longer provided in the ConfigMap
(kuryr-config). The only file present in the ConfigMap is the kuryr.conf file.
The Kuryr-Kubernetes documentation for containerized installation and how to
enable ports pool support was updated to reflect this change.

Change-Id: I1afbd1db9e90727b2f3dbed3a1341f99550b3a2b
Closes-Bug: #1900723
…t-master

Change-Id: I71f6f630c9c1362941512eb18b374b86b1e0cce4
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 22, 2020
@luis5tb
Copy link
Contributor

luis5tb commented Oct 22, 2020

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dulek, luis5tb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2020
@openshift-merge-robot openshift-merge-robot merged commit 8f2e227 into openshift:master Oct 22, 2020
MaysaMacedo pushed a commit to MaysaMacedo/kuryr-kubernetes-1 that referenced this pull request Jul 1, 2021
ovn-kubernetes: add basic control plane alerts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants