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

Init development/2.8 #3008

Merged
merged 5 commits into from
Jan 8, 2021
Merged

Init development/2.8 #3008

merged 5 commits into from
Jan 8, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'kubernetes', 'build'

Context:

Initialization of the branch development/2.8

Summary:

@TeddyAndrieux TeddyAndrieux added kind:enhancement New feature or request complexity:medium Something that requires one or few days to fix labels Jan 5, 2021
@TeddyAndrieux TeddyAndrieux requested a review from a team January 5, 2021 09:38
@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
build: Bump K8s version to 1.19.6
237297b
@TeddyAndrieux
build: Bump coredns version to 1.7.0
3b65f28 
Bump coredns to 1.7.0 as kubeadm does for Kubernetes 1.19.6
https://github.com/kubernetes/kubernetes/blob/v1.19.6/cmd/kubeadm/app/constants/constants.go#L331-L332
@TeddyAndrieux
build: Bump etcd version to 3.4.13-0
aad66b0 
Bump coredns to 3.4.13-0 as kubeadm does for Kubernetes 1.19.6
https://github.com/kubernetes/kubernetes/blob/v1.19.6/cmd/kubeadm/app/constants/constants.go#L267-L268
@TeddyAndrieux
eve: Deactivate minor version downgrade on this branch
a325e62 
Since we bump etcd version in development/2.8 we cannot downgrade from
development/2.8 to a version 2.7.x, so deactivate downgrade test for
minor version in the CI

Sees: #1750
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/init-dev-2.8 branch from 947a031 to a325e62 Compare January 5, 2021 09:45
gdemonet
gdemonet approved these changes Jan 7, 2021
View reviewed changes
eve/main.yml Show resolved Hide resolved
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 7, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.8

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.8

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 9e400ee into development/2.8 Jan 8, 2021
@bert-e bert-e deleted the improvement/init-dev-2.8 branch January 8, 2021 08:33
ChengYanJin added a commit that referenced this pull request Feb 5, 2021
@ChengYanJin
ui/monitoring: Fix the CPU Usage expression
94cab6d 
which cause the negative value

Refs: #3008
ChengYanJin added a commit that referenced this pull request Feb 12, 2021
@ChengYanJin
ui/monitoring: Fix the CPU Usage expression
1eb4e87 
which cause the negative value

Refs: #3008
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
complexity:medium Something that requires one or few days to fix kind:enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet