Skip to content

Commit ece26e3

Browse files
committed
chore(kubernetes): get up to date
1 parent 4efdf4a commit ece26e3

17 files changed

+148
-117
lines changed

.github/renovate/groups.json5

-41
This file was deleted.

.github/workflows/flux-local.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020

2121
- name: Run flux-local test
2222
uses: docker://ghcr.io/allenporter/flux-local:v7.2.1
@@ -39,12 +39,12 @@ jobs:
3939
fail-fast: false
4040
steps:
4141
- name: Checkout Pull Request Branch
42-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
42+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4343
with:
4444
path: pull
4545

4646
- name: Checkout Default Branch
47-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
47+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4848
with:
4949
ref: "${{ github.event.repository.default_branch }}"
5050
path: default
@@ -70,20 +70,20 @@ jobs:
7070
cat diff.patch >> $GITHUB_OUTPUT
7171
echo 'EOF' >> $GITHUB_OUTPUT
7272
73-
- name: Generate Token
74-
if: ${{ steps.diff.outputs.diff != '' }}
75-
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1
73+
- if: ${{ steps.diff.outputs.diff != '' }}
74+
name: Generate Token
75+
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
7676
id: app-token
7777
with:
78-
app-id: "${{ secrets.BOT_APP_ID }}"
79-
private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
78+
app-id: ${{ secrets.BOT_APP_ID }}
79+
private-key: ${{ secrets.BOT_APP_PRIVATE_KEY }}
8080

81-
- name: Add Comment
82-
if: ${{ steps.diff.outputs.diff != '' }}
83-
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
81+
- if: ${{ steps.diff.outputs.diff != '' }}
82+
name: Add Comment
83+
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2.8.2
8484
with:
85-
repo-token: "${{ steps.app-token.outputs.token }}"
86-
message-id: "${{ github.event.pull_request.number }}/kubernetes/${{ matrix.resources }}"
85+
repo-token: ${{ steps.app-token.outputs.token }}
86+
message-id: ${{ github.event.pull_request.number }}/kubernetes/${{ matrix.resources }}
8787
message-failure: Diff was not successful
8888
message: |
8989
```diff

.github/workflows/image-pull.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
pull: ${{ steps.extract.outputs.pull }}
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2727
with:
28-
ref: "${{ matrix.branches == 'default' && github.event.repository.default_branch || '' }}"
28+
ref: ${{ matrix.branches == 'default' && github.event.repository.default_branch || '' }}
2929

3030
- name: Gather Images
3131
uses: docker://ghcr.io/allenporter/flux-local:v7.2.1
@@ -44,10 +44,10 @@ jobs:
4444
run: echo "${{ matrix.branches }}=$(jq --compact-output '.' images.json)" >> $GITHUB_OUTPUT
4545

4646
diff:
47+
if: ${{ needs.extract.outputs.default != needs.extract.outputs.pull }}
4748
needs: extract
4849
name: Diff Images
4950
runs-on: ubuntu-latest
50-
if: ${{ needs.extract.outputs.default != needs.extract.outputs.pull }}
5151
outputs:
5252
images: ${{ steps.diff.outputs.images }}
5353
steps:
@@ -62,10 +62,10 @@ jobs:
6262
echo "images=${images}" >> $GITHUB_OUTPUT
6363
6464
pull:
65+
if: ${{ needs.diff.outputs.images != '[]' }}
6566
needs: diff
6667
name: Pull Images
6768
runs-on: k8s-gitops-runner
68-
if: ${{ needs.diff.outputs.images != '[]' }}
6969
strategy:
7070
matrix:
7171
images: ${{ fromJSON(needs.diff.outputs.images) }}

.github/workflows/label-sync.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
issues: write
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
with:
2222
sparse-checkout: .github/labels.yaml
2323

2424
- name: Sync Labels
25-
uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2
25+
uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2.3.3
2626
with:
2727
config-file: .github/labels.yaml
2828
delete-other-labels: true

.github/workflows/labeler.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
1414
steps:
1515
- name: Generate Token
16-
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1
16+
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
1717
id: app-token
1818
with:
19-
app-id: "${{ secrets.BOT_APP_ID }}"
20-
private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
19+
app-id: ${{ secrets.BOT_APP_ID }}
20+
private-key: ${{ secrets.BOT_APP_PRIVATE_KEY }}
2121

2222
- name: Labeler
23-
uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5
23+
uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
2424
with:
25-
repo-token: "${{ steps.app-token.outputs.token }}"
25+
repo-token: ${{ steps.app-token.outputs.token }}
2626
configuration-path: .github/labeler.yaml

.github/workflows/renovate.yaml

+16-14
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,46 @@ on:
1717
default: latest
1818
required: false
1919
schedule:
20-
- cron: "0 * * * *" # Every hour
20+
- cron: "0 * * * *"
2121
push:
2222
branches: ["main"]
23-
paths: [".github/renovate.json5", ".github/renovate/**.json5"]
23+
paths:
24+
- .renovaterc.json5
25+
- .renovate/**.json5
2426

2527
concurrency:
2628
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
2729
cancel-in-progress: true
2830

2931
env:
30-
LOG_LEVEL: "${{ inputs.logLevel || 'debug' }}"
32+
LOG_LEVEL: ${{ inputs.logLevel || 'debug' }}
3133
RENOVATE_AUTODISCOVER: true
32-
RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}"
33-
RENOVATE_DRY_RUN: "${{ inputs.dryRun == true }}"
34+
RENOVATE_AUTODISCOVER_FILTER: ${{ github.repository }}
35+
RENOVATE_DRY_RUN: ${{ inputs.dryRun == true }}
36+
RENOVATE_INTERNAL_CHECKS_FILTER: strict
3437
RENOVATE_PLATFORM: github
3538
RENOVATE_PLATFORM_COMMIT: true
36-
WORKFLOW_RENOVATE_VERSION: "${{ inputs.version || 'latest' }}"
39+
WORKFLOW_RENOVATE_VERSION: ${{ inputs.version || 'latest' }}
3740

3841
jobs:
3942
renovate:
4043
name: Renovate
4144
runs-on: ubuntu-latest
4245
steps:
4346
- name: Generate Token
44-
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1
47+
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
4548
id: app-token
4649
with:
47-
app-id: "${{ secrets.BOT_APP_ID }}"
48-
private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
50+
app-id: ${{ secrets.BOT_APP_ID }}
51+
private-key: ${{ secrets.BOT_APP_PRIVATE_KEY }}
4952

5053
- name: Checkout
51-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
54+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5255
with:
53-
token: "${{ steps.app-token.outputs.token }}"
56+
token: ${{ steps.app-token.outputs.token }}
5457

5558
- name: Renovate
5659
uses: renovatebot/github-action@02f4fdeb479bbb229caa7ad82cb5e691c07e80b3 # v41.0.14
5760
with:
58-
configurationFile: .github/renovate.json5
59-
token: "${{ steps.app-token.outputs.token }}"
60-
renovate-version: "${{ env.WORKFLOW_RENOVATE_VERSION }}"
61+
token: ${{ steps.app-token.outputs.token }}
62+
renovate-version: ${{ env.WORKFLOW_RENOVATE_VERSION }}

.github/workflows/tag.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Generate Token
15-
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1
15+
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
1616
id: app-token
1717
with:
18-
app-id: "${{ secrets.BOT_APP_ID }}"
19-
private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
18+
app-id: ${{ secrets.BOT_APP_ID }}
19+
private-key: ${{ secrets.BOT_APP_PRIVATE_KEY }}
2020

2121
- name: Get Previous Tag and Determine Next Tag
2222
id: determine-next-tag
23-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
23+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
2424
with:
25-
github-token: "${{ steps.app-token.outputs.token }}"
25+
github-token: ${{ steps.app-token.outputs.token }}
2626
result-encoding: string
2727
script: |
2828
const { data: tags } = await github.rest.repos.listTags({
@@ -43,9 +43,9 @@ jobs:
4343
return `${nextMajorMinor}.${nextPatch}`;
4444
4545
- name: Create Tag
46-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
46+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
4747
with:
48-
github-token: "${{ steps.app-token.outputs.token }}"
48+
github-token: ${{ steps.app-token.outputs.token }}
4949
script: |
5050
const tagName = "${{ steps.determine-next-tag.outputs.result }}";
5151

.github/renovate/autoMerge.json5 renamed to .renovate/autoMerge.json5

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
$schema: "https://docs.renovatebot.com/renovate-schema.json",
33
packageRules: [
44
{
5-
description: ["Auto-merge trusted container digests"],
5+
description: "Auto-merge trusted container digests",
66
matchDatasources: ["docker"],
77
automerge: true,
88
automergeType: "branch",
99
matchUpdateTypes: ["digest"],
10-
matchPackageNames: ["/buroa/"],
10+
matchPackageNames: ["/buroa/", "/home-operations/"],
1111
ignoreTests: true,
1212
},
1313
{
14-
description: ["Auto-merge GitHub Actions"],
14+
description: "Auto-merge GitHub Actions",
1515
matchManagers: ["github-actions"],
1616
automerge: true,
1717
automergeType: "branch",

.github/renovate/customManagers.json5 renamed to .renovate/customManagers.json5

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
customManagers: [
44
{
55
customType: "regex",
6-
description: ["Process annotated dependencies"],
6+
description: "Process annotated dependencies",
77
fileMatch: ["(^|/).+\\.ya?ml(?:\\.j2)?$"],
88
matchStrings: [
99
// # renovate: datasource=github-releases depName=kubernetes/kubernetes

.github/renovate/grafanaDashboards.json5 renamed to .renovate/grafanaDashboards.json5

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
customManagers: [
1111
{
1212
customType: "regex",
13-
description: ["Process Grafana dashboards"],
13+
description: "Process Grafana dashboards",
1414
fileMatch: ["(^|/)kubernetes/.+\\.ya?ml$"],
1515
matchStrings: [
1616
'depName="(?<depName>.*)"\\n(?<indentation>\\s+)gnetId: (?<packageName>\\d+)\\n.+revision: (?<currentValue>\\d+)',

.renovate/groups.json5

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
$schema: "https://docs.renovatebot.com/renovate-schema.json",
3+
packageRules: [
4+
{
5+
description: "1Password Connect Group",
6+
groupName: "1Password Connnect",
7+
matchDatasources: ["docker"],
8+
matchPackageNames: ["/1password/"],
9+
group: {
10+
commitMessageTopic: "{{{groupName}}} group",
11+
},
12+
},
13+
{
14+
description: "Actions Runner Controller Group",
15+
groupName: "Actions Runner Controller",
16+
matchDatasources: ["docker"],
17+
matchPackageNames: [
18+
"/gha-runner-scale-set-controller/",
19+
"/gha-runner-scale-set/",
20+
],
21+
group: {
22+
commitMessageTopic: "{{{groupName}}} group",
23+
},
24+
},
25+
{
26+
description: "Cert-Manager Group",
27+
groupName: "Cert-Manager",
28+
matchDatasources: ["docker"],
29+
matchPackageNames: ["/cert-manager/"],
30+
group: {
31+
commitMessageTopic: "{{{groupName}}} group",
32+
},
33+
},
34+
{
35+
description: "Cilium Group",
36+
groupName: "Cilium",
37+
matchDatasources: ["docker"],
38+
matchPackageNames: ["/cilium/"],
39+
group: {
40+
commitMessageTopic: "{{{groupName}}} group",
41+
},
42+
},
43+
{
44+
description: "CoreDNS Group",
45+
groupName: "CoreDNS",
46+
matchDatasources: ["docker"],
47+
matchPackageNames: ["/coredns/"],
48+
group: {
49+
commitMessageTopic: "{{{groupName}}} group",
50+
},
51+
},
52+
{
53+
description: "External Secrets Operator Group",
54+
groupName: "External Secrets Operator",
55+
matchDatasources: ["docker"],
56+
matchPackageNames: ["/external-secrets/"],
57+
group: {
58+
commitMessageTopic: "{{{groupName}}} group",
59+
},
60+
},
61+
{
62+
description: "Flux Operator Group",
63+
groupName: "Flux Operator",
64+
matchDatasources: ["docker"],
65+
matchPackageNames: ["/flux-operator/", "/flux-instance/"],
66+
group: {
67+
commitMessageTopic: "{{{groupName}}} group",
68+
},
69+
},
70+
{
71+
description: "Intel Device Plugins Group",
72+
groupName: "Intel-Device-Plugins",
73+
matchDatasources: ["docker"],
74+
matchPackageNames: [
75+
"/intel-device-plugins-operator/",
76+
"/intel-device-plugins-gpu/",
77+
],
78+
group: {
79+
commitMessageTopic: "{{{groupName}}} group",
80+
},
81+
},
82+
],
83+
}
File renamed without changes.

.github/renovate.json5 renamed to .renovaterc.json5

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
":disableRateLimiting",
1717
":gitSignOff",
1818
":semanticCommits",
19-
":timezone(America/New_York)",
19+
":timezone(America/Chicago)",
2020
],
2121
dependencyDashboardTitle: "Renovate Dashboard 🤖",
2222
suppressNotifications: ["prEditedNotification", "prIgnoreNotification"],

0 commit comments

Comments
 (0)