Cherry pick #3679 to v2.4 #3692
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add resources to CC Signed-off-by: Chip Zoller <chipzoller@gmail.com> * fix indentation Signed-off-by: Chip Zoller <chipzoller@gmail.com> --------- Signed-off-by: Chip Zoller <chipzoller@gmail.com> Signed-off-by: chipzoller <chipzoller@gmail.com>
thomasvn
approved these changes
Sep 30, 2024
jessegoodier
added a commit
that referenced
this pull request
Nov 19, 2024
commit 43fcc54 Merge: 8dbeb2e 1af2795 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Tue Oct 22 13:05:43 2024 -0500 Merge pull request #3718 from kubecost/bump-2.4.2 Bump in-code version of v2.4 branch for 2.4.2 commit 1af2795 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Tue Oct 22 18:05:39 2024 +0000 Bump to 2.4.2 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 8dbeb2e Merge: 5c4d9c2 fddded6 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Tue Oct 15 08:00:52 2024 -0500 Merge pull request #3713 from kubecost/bump-2.4.2-rc.1 Bump in-code version of v2.4 branch for 2.4.2-rc.1 commit fddded6 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Tue Oct 15 13:00:49 2024 +0000 Bump to 2.4.2-rc.1 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 5c4d9c2 Merge: 18f538d 8822486 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Oct 10 12:31:22 2024 -0500 Merge pull request #3707 from kubecost/bump-2.4.2-rc.0 Bump in-code version of v2.4 branch for 2.4.2-rc.0 commit 8822486 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Oct 10 17:31:18 2024 +0000 Bump to 2.4.2-rc.0 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 18f538d Author: Chip Zoller <chipzoller@gmail.com> Date: Mon Sep 30 11:09:57 2024 -0400 Allow defining resources for Cluster Controller (#3679) (#3692) * add resources to CC * fix indentation --------- Signed-off-by: Chip Zoller <chipzoller@gmail.com> Signed-off-by: chipzoller <chipzoller@gmail.com> commit eac7ce0 Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Sun Sep 29 09:47:29 2024 -0400 fix(prometheus): add missing container security context in server statefulset (#3585) (#3691) Signed-off-by: spiarh <ludo@spiarh.fr> Co-authored-by: Ludo <33934779+spiarh@users.noreply.github.com> Co-authored-by: Chip Zoller <chipzoller@gmail.com> Co-authored-by: Thomas Nguyen <thomasn@kubecost.com> commit 4ebba2d Merge: 9cd1acc 2a0f928 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 16:37:05 2024 -0500 Merge pull request #3689 from kubecost/bump-2.4.1 Bump in-code version of v2.4 branch for 2.4.1 commit 2a0f928 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Sep 26 21:37:02 2024 +0000 Bump to 2.4.1 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 9cd1acc Merge: 239c5fd 0153d11 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 10:17:29 2024 -0500 Merge pull request #3688 from kubecost/bump-2.4.1-rc.1 Bump in-code version of v2.4 branch for 2.4.1-rc.1 commit 0153d11 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Sep 26 15:17:25 2024 +0000 Bump to 2.4.1-rc.1 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 239c5fd Merge: 28b583c 1f9355b Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 10:12:21 2024 -0500 Merge pull request #3687 from kubecost/cherry-pick-1c7605-v2.4 ENG-2851 - Add `/diagnostic/nodeCount` endpoint (cherry-pick #3684) commit 1f9355b Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 15:11:57 2024 +0000 Merge pull request #3684 from kubecost/nik/eng-2851 ENG-2851 - Add `/diagnostic/nodeCount` endpoint commit 28b583c Merge: 152bc73 26d237f Author: Cliff Colvin <ccolvin@kubecost.com> Date: Wed Sep 25 13:01:44 2024 -0500 Merge pull request #3686 from kubecost/bump-2.4.1-rc.0 Bump in-code version of v2.4 branch for 2.4.1-rc.0 commit 26d237f Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Wed Sep 25 18:01:40 2024 +0000 Bump to 2.4.1-rc.0 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com>
jessegoodier
added a commit
that referenced
this pull request
Nov 25, 2024
commit 448a94a Merge: a5ff4bb 289e19a Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Nov 21 13:31:55 2024 -0600 Merge pull request #3745 from kubecost/bump-2.4.3 Bump in-code version of v2.4 branch for 2.4.3 commit 289e19a Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Nov 21 19:31:52 2024 +0000 Bump to 2.4.3 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit a5ff4bb Merge: 55fb871 44b45c3 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Nov 21 13:00:54 2024 -0600 Merge pull request #3744 from kubecost/bump-2.4.3-rc.0 Bump in-code version of v2.4 branch for 2.4.3-rc.0 commit 44b45c3 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Nov 21 19:00:50 2024 +0000 Bump to 2.4.3-rc.0 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 55fb871 Merge: 43fcc54 72c2db2 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Nov 21 12:44:56 2024 -0600 Merge pull request #3743 from kubecost/cherry-pick-16343f-v2.4 resolve issue with prometheus pull (cherry-pick #3741) commit 72c2db2 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Nov 21 18:44:30 2024 +0000 Merge pull request #3741 from kubecost/fix-prometheus resolve issue with prometheus pull commit 43fcc54 Merge: 8dbeb2e 1af2795 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Tue Oct 22 13:05:43 2024 -0500 Merge pull request #3718 from kubecost/bump-2.4.2 Bump in-code version of v2.4 branch for 2.4.2 commit 1af2795 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Tue Oct 22 18:05:39 2024 +0000 Bump to 2.4.2 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 8dbeb2e Merge: 5c4d9c2 fddded6 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Tue Oct 15 08:00:52 2024 -0500 Merge pull request #3713 from kubecost/bump-2.4.2-rc.1 Bump in-code version of v2.4 branch for 2.4.2-rc.1 commit fddded6 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Tue Oct 15 13:00:49 2024 +0000 Bump to 2.4.2-rc.1 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 5c4d9c2 Merge: 18f538d 8822486 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Oct 10 12:31:22 2024 -0500 Merge pull request #3707 from kubecost/bump-2.4.2-rc.0 Bump in-code version of v2.4 branch for 2.4.2-rc.0 commit 8822486 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Oct 10 17:31:18 2024 +0000 Bump to 2.4.2-rc.0 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 18f538d Author: Chip Zoller <chipzoller@gmail.com> Date: Mon Sep 30 11:09:57 2024 -0400 Allow defining resources for Cluster Controller (#3679) (#3692) * add resources to CC * fix indentation --------- Signed-off-by: Chip Zoller <chipzoller@gmail.com> Signed-off-by: chipzoller <chipzoller@gmail.com> commit eac7ce0 Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Sun Sep 29 09:47:29 2024 -0400 fix(prometheus): add missing container security context in server statefulset (#3585) (#3691) Signed-off-by: spiarh <ludo@spiarh.fr> Co-authored-by: Ludo <33934779+spiarh@users.noreply.github.com> Co-authored-by: Chip Zoller <chipzoller@gmail.com> Co-authored-by: Thomas Nguyen <thomasn@kubecost.com> commit 4ebba2d Merge: 9cd1acc 2a0f928 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 16:37:05 2024 -0500 Merge pull request #3689 from kubecost/bump-2.4.1 Bump in-code version of v2.4 branch for 2.4.1 commit 2a0f928 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Sep 26 21:37:02 2024 +0000 Bump to 2.4.1 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 9cd1acc Merge: 239c5fd 0153d11 Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 10:17:29 2024 -0500 Merge pull request #3688 from kubecost/bump-2.4.1-rc.1 Bump in-code version of v2.4 branch for 2.4.1-rc.1 commit 0153d11 Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Thu Sep 26 15:17:25 2024 +0000 Bump to 2.4.1-rc.1 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> commit 239c5fd Merge: 28b583c 1f9355b Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 10:12:21 2024 -0500 Merge pull request #3687 from kubecost/cherry-pick-1c7605-v2.4 ENG-2851 - Add `/diagnostic/nodeCount` endpoint (cherry-pick #3684) commit 1f9355b Author: Cliff Colvin <ccolvin@kubecost.com> Date: Thu Sep 26 15:11:57 2024 +0000 Merge pull request #3684 from kubecost/nik/eng-2851 ENG-2851 - Add `/diagnostic/nodeCount` endpoint commit 28b583c Merge: 152bc73 26d237f Author: Cliff Colvin <ccolvin@kubecost.com> Date: Wed Sep 25 13:01:44 2024 -0500 Merge pull request #3686 from kubecost/bump-2.4.1-rc.0 Bump in-code version of v2.4 branch for 2.4.1-rc.0 commit 26d237f Author: Cliff Colvin (release bot variant) <ccolvin@kubecost.com> Date: Wed Sep 25 18:01:40 2024 +0000 Bump to 2.4.1-rc.0 Commit auto-generated by release script. Signed-off-by: Cliff Colvin (release bot variant) <ccolvin@kubecost.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Chip Zoller chipzoller@gmail.com
Signed-off-by: Chip Zoller chipzoller@gmail.com
Signed-off-by: Chip Zoller chipzoller@gmail.com
Signed-off-by: chipzoller chipzoller@gmail.com
What does this PR change?
Does this PR rely on any other PRs?
Cherry pick #3679 to v2.4
How does this PR impact users? (This is the kind of thing that goes in release notes!)
Links to Issues or tickets this PR addresses or fixes
What risks are associated with merging this PR? What is required to fully test this PR?
How was this PR tested?
Have you made an update to documentation? If so, please provide the corresponding PR.