Skip to content

Commit 799e2a0

Browse files
authored
Merge branch 'kubernetes-sigs:master' into cilium-ha
2 parents 0e32d90 + e6a5266 commit 799e2a0

File tree

72 files changed

+391
-403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+391
-403
lines changed

.github/workflows/auto-label-os.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
issues: write
1414

1515
steps:
16-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
16+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
1717

1818
- name: Parse issue form
1919
uses: stefanbuck/github-issue-parser@2ea9b35a8c584529ed00891a8f7e41dc46d0441e
@@ -22,7 +22,7 @@ jobs:
2222
template-path: .github/ISSUE_TEMPLATE/bug-report.yaml
2323

2424
- name: Set labels based on OS field
25-
uses: redhat-plumbers-in-action/advanced-issue-labeler@e38e6809c5420d038eed380d49ee9a6ca7c92dbf
25+
uses: redhat-plumbers-in-action/advanced-issue-labeler@b80ae64e3e156e9c111b075bfa04b295d54e8e2e
2626
with:
2727
issue-form: ${{ steps.issue-parser.outputs.jsonString }}
2828
section: os

.github/workflows/upgrade-patch-versions-schedule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
outputs:
1414
branches: ${{ steps.get-branches.outputs.data }}
1515
steps:
16-
- uses: octokit/graphql-action@8ad880e4d437783ea2ab17010324de1075228110
16+
- uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93
1717
id: get-branches
1818
with:
1919
query: |

.github/workflows/upgrade-patch-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
update-patch-versions:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
14+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
1515
with:
1616
ref: ${{ inputs.branch }}
1717
- uses: actions/setup-python@v6
@@ -29,7 +29,7 @@ jobs:
2929
~/.cache/pre-commit
3030
- run: pre-commit run --all-files propagate-ansible-variables
3131
continue-on-error: true
32-
- uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
32+
- uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412
3333
with:
3434
commit-message: Patch versions updates
3535
title: Patch versions updates - ${{ inputs.branch }}

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ variables:
2424
ANSIBLE_REMOTE_USER: kubespray
2525
ANSIBLE_PRIVATE_KEY_FILE: /tmp/id_rsa
2626
ANSIBLE_INVENTORY: /tmp/inventory
27-
ANSIBLE_STDOUT_CALLBACK: "debug"
27+
ANSIBLE_STDOUT_CALLBACK: "default"
2828
RESET_CHECK: "false"
2929
REMOVE_NODE_CHECK: "false"
3030
UPGRADE_TEST: "false"

.gitlab-ci/kubevirt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
interruptible: true
55
script:
66
- ansible-playbook tests/cloud_playbooks/create-kubevirt.yml
7-
-c local -e @"tests/files/${TESTCASE}.yml"
7+
-e @"tests/files/${TESTCASE}.yml"
88
- ./tests/scripts/testcases_run.sh
99
variables:
1010
ANSIBLE_TIMEOUT: "120"

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v5.0.0
4+
rev: v6.0.0
55
hooks:
66
- id: check-added-large-files
77
- id: check-case-conflict
@@ -15,21 +15,21 @@ repos:
1515
- id: trailing-whitespace
1616

1717
- repo: https://github.com/adrienverge/yamllint.git
18-
rev: v1.35.1
18+
rev: v1.37.1
1919
hooks:
2020
- id: yamllint
2121
args: [--strict]
2222

2323
- repo: https://github.com/shellcheck-py/shellcheck-py
24-
rev: v0.10.0.1
24+
rev: v0.11.0.1
2525
hooks:
2626
- id: shellcheck
2727
args: ["--severity=error"]
2828
exclude: "^.git"
2929
files: "\\.sh$"
3030

3131
- repo: https://github.com/ansible/ansible-lint
32-
rev: v25.1.1
32+
rev: v25.11.0
3333
hooks:
3434
- id: ansible-lint
3535
additional_dependencies:
@@ -38,7 +38,7 @@ repos:
3838
- distlib
3939

4040
- repo: https://github.com/golangci/misspell
41-
rev: v0.6.0
41+
rev: v0.7.0
4242
hooks:
4343
- id: misspell
4444
exclude: "OWNERS_ALIASES$"

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ RUN --mount=type=bind,source=requirements.txt,target=requirements.txt \
3535
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3636

3737
RUN OS_ARCHITECTURE=$(dpkg --print-architecture) \
38-
&& curl -L "https://dl.k8s.io/release/v1.33.5/bin/linux/${OS_ARCHITECTURE}/kubectl" -o /usr/local/bin/kubectl \
39-
&& echo "$(curl -L "https://dl.k8s.io/release/v1.33.5/bin/linux/${OS_ARCHITECTURE}/kubectl.sha256")" /usr/local/bin/kubectl | sha256sum --check \
38+
&& curl -L "https://dl.k8s.io/release/v1.34.2/bin/linux/${OS_ARCHITECTURE}/kubectl" -o /usr/local/bin/kubectl \
39+
&& echo "$(curl -L "https://dl.k8s.io/release/v1.34.2/bin/linux/${OS_ARCHITECTURE}/kubectl.sha256")" /usr/local/bin/kubectl | sha256sum --check \
4040
&& chmod a+x /usr/local/bin/kubectl
4141

4242
COPY *.yml ./

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,23 @@ Note:
111111
<!-- BEGIN ANSIBLE MANAGED BLOCK -->
112112

113113
- Core
114-
- [kubernetes](https://github.com/kubernetes/kubernetes) 1.33.5
115-
- [etcd](https://github.com/etcd-io/etcd) 3.5.23
114+
- [kubernetes](https://github.com/kubernetes/kubernetes) 1.34.2
115+
- [etcd](https://github.com/etcd-io/etcd) 3.5.25
116116
- [docker](https://www.docker.com/) 28.3
117-
- [containerd](https://containerd.io/) 2.1.4
118-
- [cri-o](http://cri-o.io/) 1.33.5 (experimental: see [CRI-O Note](docs/CRI/cri-o.md). Only on fedora, ubuntu and centos based OS)
117+
- [containerd](https://containerd.io/) 2.1.5
118+
- [cri-o](http://cri-o.io/) 1.34.2 (experimental: see [CRI-O Note](docs/CRI/cri-o.md). Only on fedora, ubuntu and centos based OS)
119119
- Network Plugin
120120
- [cni-plugins](https://github.com/containernetworking/plugins) 1.8.0
121-
- [calico](https://github.com/projectcalico/calico) 3.30.3
122-
- [cilium](https://github.com/cilium/cilium) 1.18.2
121+
- [calico](https://github.com/projectcalico/calico) 3.30.4
122+
- [cilium](https://github.com/cilium/cilium) 1.18.4
123123
- [flannel](https://github.com/flannel-io/flannel) 0.27.3
124124
- [kube-ovn](https://github.com/alauda/kube-ovn) 1.12.21
125125
- [kube-router](https://github.com/cloudnativelabs/kube-router) 2.1.1
126126
- [multus](https://github.com/k8snetworkplumbingwg/multus-cni) 4.2.2
127127
- [kube-vip](https://github.com/kube-vip/kube-vip) 0.8.0
128128
- Application
129129
- [cert-manager](https://github.com/jetstack/cert-manager) 1.15.3
130-
- [coredns](https://github.com/coredns/coredns) 1.12.0
130+
- [coredns](https://github.com/coredns/coredns) 1.12.1
131131
- [ingress-nginx](https://github.com/kubernetes/ingress-nginx) 1.13.3
132132
- [argocd](https://argoproj.github.io/) 2.14.5
133133
- [helm](https://helm.sh/) 3.18.4

contrib/collection.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash -eux
2+
# Install collection from source assuming dependencies are present.
3+
# Run in SemaphoreUI this bash script can install Kubespray from the repo
4+
NAMESPACE=kubernetes_sigs
5+
COLLECTION=kubespray
6+
MY_VER=$(grep '^version:' galaxy.yml|cut -d: -f2|sed 's/ //')
7+
8+
ansible-galaxy collection build --force --output-path .
9+
ansible-galaxy collection install --offline --force $NAMESPACE-$COLLECTION-$MY_VER.tar.gz

contrib/terraform/upcloud/modules/kubernetes-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
upcloud = {
55
source = "UpCloudLtd/upcloud"
6-
version = "~>5.9.0"
6+
version = "~>5.29.1"
77
}
88
}
99
required_version = ">= 0.13"

0 commit comments

Comments
 (0)