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

Apply 2024.1 backports from 2023.1 #172

Merged
merged 11 commits into from
Jul 5, 2024
Merged

Conversation

seunghun1ee
Copy link
Member

Following commits were applied

Commit | Change-Id | Message
2c2dfeb I5ca9cb8c7afb1ce9cb1a337a9fe2faf3fab3ba61 Removed appending to ca.cart
25d5472 None Run podman run --rm for kubelet version
835329c None Use ssh_cmd to get kubelet version
b4ed3ec None Fix containerd runtime for releases older than 1.27
fceb8d4 I3a0700046bade7bd0b3a1b319f66b8f675f0c8fb coredns: Use /run/systemd/resolve/resolv.conf
4cd6339 I5b4c55307acd822168645871bebe0a31eee0ee27 autoscaler: Update manifest per upstream
d0e1aa2 I05e8c2be4e4c8e66a166b485ec7851875dca8b1c Update magnum k8s monitoring infra
abc814f Ibaa3b150e024918b6fc963eb6ca62bd18690a3c4 upgrade coredns
4abaf43 I05e8c2be4e4c8e66a166b485ec7851875dca8b1c Update magnum k8s monitoring infra
3667d28 I10a6a4d72e9ec635f2c73d9fe64a8d136228f532 Support extra_network and extra_subnet labels

mnasiadka and others added 10 commits July 1, 2024 16:36
This allows users to add extra network interface to cluster nodes, e.g.
storage network.

Story: 2002448
Task: 21983
Co-Authored-By: Bharat Kunwar <bharat@stackhpc.com>

Change-Id: I10a6a4d72e9ec635f2c73d9fe64a8d136228f532
(cherry picked from commit bea8c72)
(cherry picked from commit 8260f11)
(cherry picked from commit d6c0a2d)
(cherry picked from commit 6227555)
(cherry picked from commit 3667d28)
* Prometheus-server now runs only on master nodes.
* Update prometheus-operator helm chart and tag.
* Update prometheus-adapter version.
* Deprecation notice for prometheus_monitoring component.

task: 41569
story: 2006765

Signed-off-by: Diogo Guerra <diogo.filipe.tomas.guerra@cern.ch>
Change-Id: I05e8c2be4e4c8e66a166b485ec7851875dca8b1c
(cherry picked from commit 0934160)
(cherry picked from commit 9a47696)
(cherry picked from commit 3041908)
(cherry picked from commit 5f786f0)
(cherry picked from commit 4abaf43)
Story: 2009874

Change-Id: Ibaa3b150e024918b6fc963eb6ca62bd18690a3c4
(cherry picked from commit 15c2bc2)
(cherry picked from commit bf7fd64)
(cherry picked from commit d7a502e)
(cherry picked from commit eaaa762)
(cherry picked from commit abc814f)
* Prometheus-server now runs only on master nodes.
* Update prometheus-operator helm chart and tag.
* Update prometheus-adapter version.
* Deprecation notice for prometheus_monitoring component.

Since v1.20 (changes are gradually introduced in next versions)
k8s components are exposing (by default) metrics on 127.0.0.1
and are changing expose port.

* Fix metrics address and ports post 1.20
* Extended memory limits to 64M
* Changed expose addr to 127.0.0.1
* Changed expose ports

task: 41569
story: 2006765

Signed-off-by: Diogo Guerra <diogo.filipe.tomas.guerra@cern.ch>
Co-authored-by: Grzegorz Bialas <grzegorz@stackhpc.com>
Change-Id: I05e8c2be4e4c8e66a166b485ec7851875dca8b1c
(cherry picked from commit c92f605)
(cherry picked from commit 32b22e5)
(cherry picked from commit 5b56182)
(cherry picked from commit 25e3bdc)
(cherry picked from commit d0e1aa2)
Change-Id: I5b4c55307acd822168645871bebe0a31eee0ee27
(cherry picked from commit e3561684dcc2508df69d271bc5d9666b48e3c86e)
(cherry picked from commit a351884)
(cherry picked from commit 29c99e9)
(cherry picked from commit 4cd6339)
In FCOS36 and later coredns started failing with loops.
/etc/resolv.conf will not work with coredns (see [1]).

Tested on FC35/36/37.

[1]: https://github.com/coredns/coredns/blob/master/plugin/loop/README.md#troubleshooting

Change-Id: I3a0700046bade7bd0b3a1b319f66b8f675f0c8fb
(cherry picked from commit 037a71aaf8664a7f6a8926dceb294592d73da591)
(cherry picked from commit bf99035)
(cherry picked from commit 0f3ff1a)
(cherry picked from commit fceb8d4)
(cherry picked from commit d589f0f)
(cherry picked from commit 3f901a5)
(cherry picked from commit b4ed3ec)
(cherry picked from commit cb52da1)
(cherry picked from commit 560855c)
(cherry picked from commit 835329c)
(cherry picked from commit c13a91e)
(cherry picked from commit 5cbc471)
(cherry picked from commit 25d5472)
Appending to ca.crt in make-cert-client.sh (introduced in #724203) causes
multiple identical ca certs being added into /etc/kubernetes/certs/ca.crt which
prevents kube-controller-manager from starting with following error:

'expected 1 certificate, found X'

Task: 45392
Story: 2010042

Change-Id: I5ca9cb8c7afb1ce9cb1a337a9fe2faf3fab3ba61
(cherry picked from commit 2c2dfeb)
@seunghun1ee seunghun1ee requested a review from a team July 1, 2024 15:55
@seunghun1ee seunghun1ee self-assigned this Jul 1, 2024
@mnasiadka mnasiadka merged commit 1dcd259 into stackhpc/2024.1 Jul 5, 2024
3 checks passed
@mnasiadka mnasiadka deleted the 2024.1-cherrypick branch July 5, 2024 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants