Skip to content

Commit cda1d72

Browse files
shubham-sumoshubham-sumo
committed
Merge branch 'refs/heads/main' into renovate/opentelemetry-operator
2 parents 34d8371 + f72911f commit cda1d72

29 files changed

Lines changed: 154 additions & 144 deletions

‎.changelog/4168.changed.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore(deps): bump public.ecr.aws/sumologic/kubernetes-setup Docker tag to v3.17.0

‎.changelog/4171.changed.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore(deps): bump Helm release tailing-sidecar-operator from 0.18.1 to 0.20.3

‎.changelog/4173.changed.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore(deps): bump Helm release falco from 7.0.2 to 7.2.1

‎.changelog/4181.changed.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore(deps): bump public.ecr.aws/sumologic/kubernetes-setup Docker tag to v3.18.0

‎.github/workflows/renovate-changelog.yaml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ jobs:
1414
contents: write
1515
pull-requests: write
1616
steps:
17-
- name: Generate token
18-
id: generate_token
17+
- name: Generate GitHub App token
18+
id: app-token
1919
uses: actions/create-github-app-token@v2
2020
with:
21-
app-id: ${{ secrets.BACKPORT_APP_ID }}
22-
private-key: ${{ secrets.BACKPORT_PRIVATE_KEY }}
21+
app-id: ${{ secrets.RENOVATE_APP_ID }}
22+
private-key: ${{ secrets.RENOVATE_PRIVATE_KEY }}
2323

2424
- name: Checkout repository
2525
uses: actions/checkout@v6
2626
with:
27-
token: ${{ steps.generate_token.outputs.token }}
27+
token: ${{ steps.app-token.outputs.token }}
2828
ref: ${{ github.head_ref }}
2929

3030
- name: Create changelog entry
@@ -35,14 +35,19 @@ jobs:
3535
CHANGELOG_FILE=".changelog/${PR_NUMBER}.changed.txt"
3636
mkdir -p .changelog
3737
38-
echo "$PR_TITLE" > "$CHANGELOG_FILE"
39-
echo "Created changelog file: $CHANGELOG_FILE with content: $PR_TITLE"
38+
# Skip if any changelog fragment already exists for this PR (changed, fixed, breaking, added)
39+
if ls .changelog/${PR_NUMBER}.*.txt 1>/dev/null 2>&1; then
40+
echo "Changelog entry already exists for PR #${PR_NUMBER}, skipping"
41+
else
42+
echo "$PR_TITLE" > "$CHANGELOG_FILE"
43+
echo "Created changelog file: $CHANGELOG_FILE with content: $PR_TITLE"
44+
fi
4045
4146
- name: Commit changelog
4247
run: |
4348
# Configure git
44-
git config --local user.email "action@github.com"
45-
git config --local user.name "GitHub Action"
49+
git config --local user.email "279692411+renovatebot-sumologic[bot]@users.noreply.github.com"
50+
git config --local user.name "renovatebot-sumologic[bot]"
4651
4752
# Add and commit changelog if there are changes
4853
git add .changelog/

‎.github/workflows/renovate-scheduler.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ on:
44
- cron: "30 18 * * *" # every day at 18:30 UTC (12:00 AM IST)
55
workflow_dispatch:
66
inputs:
7+
logLevel:
8+
description: "Log level"
9+
type: choice
10+
default: "info"
11+
options:
12+
- "info"
13+
- "debug"
14+
- "warn"
715
dryRun:
8-
description: "Run in dry-run mode (no changes made)"
16+
description: "Dry-run: full (simulate PRs), lookup (check updates only), extract (parse deps only)"
917
type: choice
1018
default: ""
1119
options:
@@ -16,16 +24,8 @@ on:
1624

1725
jobs:
1826
renovate:
19-
runs-on: ubuntu-24.04
20-
steps:
21-
- uses: actions/checkout@v6
22-
23-
- name: Renovate run
24-
uses: renovatebot/github-action@v46.1.10
25-
env:
26-
LOG_LEVEL: debug
27-
RENOVATE_REPOSITORIES: SumoLogic/sumologic-kubernetes-collection
28-
RENOVATE_DRY_RUN: ${{ github.event.inputs.dryRun }}
29-
with:
30-
token: ${{ secrets.GITHUB_TOKEN }}
31-
configurationFile: renovate.json
27+
uses: ./.github/workflows/workflow-renovate-run.yaml
28+
with:
29+
logLevel: ${{ github.event.inputs.logLevel || 'info' }}
30+
dryRun: ${{ github.event.inputs.dryRun || '' }}
31+
secrets: inherit

‎.github/workflows/sync-repositories.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Sync Repositories
22

33
on:
4+
schedule:
5+
- cron: "0 6 * * *" # every day at 06:00 UTC
46
workflow_dispatch:
57

68
jobs:
@@ -10,46 +12,66 @@ jobs:
1012
matrix:
1113
include:
1214
- src_repository: registry.k8s.io/metrics-server/metrics-server
15+
src_yaml_path: ci/skopeo/metrics-server.yaml
1316
suffix: METRICS_SERVER
1417
- src_repository: docker.io/busybox
18+
src_yaml_path: ci/skopeo/busybox.yaml
1519
suffix: BUSYBOX
1620
- src_repository: docker.io/nginxinc/nginx-unprivileged
21+
src_yaml_path: ci/skopeo/nginx-unprivileged.yaml
1722
suffix: NGINX_UNPRIVILEGED
1823
- src_repository: docker.io/telegraf
24+
src_yaml_path: ci/skopeo/telegraf.yaml
1925
suffix: TELEGRAF
2026
- src_repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet
27+
src_yaml_path: ci/skopeo/autoinstrumentation-dotnet.yaml
2128
suffix: AUTOINSTRUMENTATION_DOTNET
2229
- src_repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java
30+
src_yaml_path: ci/skopeo/autoinstrumentation-java.yaml
2331
suffix: AUTOINSTRUMENTATION_JAVA
2432
- src_repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs
33+
src_yaml_path: ci/skopeo/autoinstrumentation-nodejs.yaml
2534
suffix: AUTOINSTRUMENTATION_NODEJS
2635
- src_repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python
36+
src_yaml_path: ci/skopeo/autoinstrumentation-python.yaml
2737
suffix: AUTOINSTRUMENTATION_PYTHON
2838
- src_repository: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
39+
src_yaml_path: ci/skopeo/opentelemetry-operator.yaml
2940
suffix: OPENTELEMETRY_OPERATOR
3041
- src_repository: public.ecr.aws/falcosecurity/falco-driver-loader
42+
src_yaml_path: ci/skopeo/falco-driver-loader.yaml
3143
suffix: FALCO_DRIVER_LOADER
3244
- src_repository: public.ecr.aws/falcosecurity/falco-no-driver
45+
src_yaml_path: ci/skopeo/falco-no-driver.yaml
3346
suffix: FALCO_NO_DRIVER
3447
- src_repository: quay.io/brancz/kube-rbac-proxy
48+
src_yaml_path: ci/skopeo/kube-rbac-proxy.yaml
3549
suffix: KUBE_RBAC_PROXY
3650
- src_repository: quay.io/influxdb/telegraf-operator
51+
src_yaml_path: ci/skopeo/telegraf-operator.yaml
3752
suffix: TELEGRAF_OPERATOR
3853
- src_repository: quay.io/prometheus/node-exporter
54+
src_yaml_path: ci/skopeo/node-exporter.yaml
3955
suffix: NODE_EXPORTER
4056
- src_repository: quay.io/prometheus/prometheus
57+
src_yaml_path: ci/skopeo/prometheus.yaml
4158
suffix: PROMETHEUS
4259
- src_repository: quay.io/prometheus-operator/prometheus-config-reloader
60+
src_yaml_path: ci/skopeo/prometheus-config-reloader.yaml
4361
suffix: PROMETHEUS_CONFIG_RELOADER
4462
- src_repository: quay.io/prometheus-operator/prometheus-operator
63+
src_yaml_path: ci/skopeo/prometheus-operator.yaml
4564
suffix: PROMETHEUS_OPERATOR
4665
- src_repository: quay.io/thanos/thanos
66+
src_yaml_path: ci/skopeo/thanos.yaml
4767
suffix: THANOS
4868
- src_repository: registry.k8s.io/kube-state-metrics/kube-state-metrics
69+
src_yaml_path: ci/skopeo/kube-state-metrics.yaml
4970
suffix: KUBE_STATE_METRICS
5071
uses: ./.github/workflows/workflow-sync-repositories.yaml
5172
with:
5273
src_repository: ${{ matrix.src_repository }}
74+
src_yaml_path: ${{ matrix.src_yaml_path }}
5375
dest_docker_namespace: docker.io/sumologic
5476
dest_ecr_namespace: public.ecr.aws/a4t4y2n3
5577
secrets:

‎.github/workflows/workflow-renovate-run.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Renovate Run
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
logLevel:
7+
description: "Override default log level"
8+
required: false
9+
default: "info"
10+
type: string
11+
dryRun:
12+
description: "Dry-run mode (full, lookup, extract, or empty)"
13+
required: false
14+
default: ""
15+
type: string
16+
configurationFile:
17+
description: "Path to renovate config file"
18+
required: false
19+
default: "renovate.json"
20+
type: string
21+
secrets:
22+
RENOVATE_APP_ID:
23+
required: true
24+
RENOVATE_PRIVATE_KEY:
25+
required: true
26+
27+
concurrency: renovate
28+
29+
jobs:
30+
renovate:
31+
runs-on: ubuntu-24.04
32+
steps:
33+
- uses: actions/checkout@v6
34+
35+
- name: Validate Renovate config
36+
uses: rinchsan/renovate-config-validator@v0.2.1
37+
with:
38+
pattern: ${{ inputs.configurationFile }}
39+
40+
- name: Generate GitHub App token
41+
id: app-token
42+
uses: actions/create-github-app-token@v2
43+
with:
44+
app-id: ${{ secrets.RENOVATE_APP_ID }}
45+
private-key: ${{ secrets.RENOVATE_PRIVATE_KEY }}
46+
47+
- name: Renovate run
48+
uses: renovatebot/github-action@v46.1.11
49+
env:
50+
LOG_LEVEL: ${{ inputs.logLevel }}
51+
RENOVATE_REPOSITORIES: ${{ github.repository }}
52+
RENOVATE_DRY_RUN: ${{ inputs.dryRun }}
53+
RENOVATE_ONBOARDING: "false"
54+
RENOVATE_USERNAME: "renovatebot-sumologic[bot]"
55+
RENOVATE_GIT_AUTHOR: "renovatebot-sumologic[bot] <279692411+renovatebot-sumologic[bot]@users.noreply.github.com>"
56+
with:
57+
token: ${{ steps.app-token.outputs.token }}
58+
configurationFile: ${{ inputs.configurationFile }}

‎ci/skopeo/kube-rbac-proxy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
quay.io:
2-
images:
3-
brancz/kube-rbac-proxy: []
2+
images-by-semver:
3+
brancz/kube-rbac-proxy: ">= 0.5.0"

‎ci/skopeo/node-exporter.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
quay.io:
2-
images:
3-
prometheus/node-exporter: []
2+
images-by-semver:
3+
prometheus/node-exporter: ">= 0.18.0"

0 commit comments

Comments
 (0)