Skip to content

Commit 715c6db

Browse files
authored
Merge branch 'main' into dependabot/go_modules/github.com/elastic/package-spec/v3-3.1.5
2 parents 3b85386 + 2116209 commit 715c6db

File tree

5 files changed

+128
-3
lines changed

5 files changed

+128
-3
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: bump-elastic-stack-version
3+
4+
on:
5+
workflow_dispatch:
6+
schedule:
7+
- cron: '0 15 * * 1-5'
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
bump-elastic-stack:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
contents: write
17+
pull-requests: write
18+
strategy:
19+
fail-fast: false
20+
steps:
21+
- uses: actions/checkout@v4
22+
23+
- name: Install Updatecli in the runner
24+
uses: updatecli/updatecli-action@9a37c7e35598d7b37d8e7568b40ed9538112be01 # v0.76.1
25+
26+
- name: Run Updatecli in Apply mode
27+
# TODO: Change from diff to apply.
28+
run: updatecli diff --config .github/workflows/updatecli.d/bump-elastic-stack-version.yml --values .github/workflows/updatecli.d/scm.yml
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.ECOSYSTEM_USER_TOKEN }}
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
---
2+
name: Bump elastic-stack versions
3+
pipelineid: 'bump-elastic-stack-version'
4+
5+
actions:
6+
default:
7+
title: '[updatecli] update elastic stack version for testing {{ source "latestVersion" }}'
8+
kind: github/pullrequest
9+
scmid: default
10+
spec:
11+
labels:
12+
- automation
13+
- dependency
14+
15+
scms:
16+
default:
17+
kind: github
18+
spec:
19+
owner: '{{ .scm.owner }}'
20+
repository: '{{ .scm.repository }}'
21+
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
22+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
23+
commitusingapi: true
24+
25+
sources:
26+
latestSnapshot:
27+
name: Get latest snapshot build
28+
kind: json
29+
spec:
30+
file: https://storage.googleapis.com/artifacts-api/snapshots/main.json
31+
key: .build_id
32+
latest7xSnapshot:
33+
name: Get latest 7.x snapshot build
34+
kind: json
35+
spec:
36+
file: https://storage.googleapis.com/artifacts-api/snapshots/7.17.json
37+
key: .build_id
38+
latest8xVersion:
39+
name: Get latest 8.x version
40+
kind: file
41+
transformers:
42+
# Get only the version to avoid spaces and newlines.
43+
- findsubmatch:
44+
pattern: '([0-9\.]+)'
45+
captureindex: 1
46+
spec:
47+
file: https://storage.googleapis.com/artifacts-api/releases/current/8
48+
latestRegistryVersion:
49+
name: Get latest Package Registry version
50+
kind: json
51+
spec:
52+
file: https://api.github.com/repos/elastic/package-registry/releases/latest
53+
key: .tag_name
54+
55+
targets:
56+
update-snapshot:
57+
name: "Update snapshot"
58+
kind: file
59+
sourceid: latestSnapshot
60+
scmid: default
61+
spec:
62+
file: Makefile
63+
matchpattern: '(./scripts/test-stack-command.sh) 8\.[^\s]+-SNAPSHOT'
64+
replacepattern: '$1 {{ source "latestSnapshot" }}-SNAPSHOT'
65+
update-7x-version:
66+
name: "Update 7.x version"
67+
kind: file
68+
sourceid: latest7xSnapshot
69+
scmid: default
70+
spec:
71+
file: Makefile
72+
matchpattern: '(./scripts/test-stack-command.sh) 7\.17\.[^\s]*'
73+
replacepattern: '$1 {{ source "latest7xSnapshot" }}-SNAPSHOT'
74+
update-default-version:
75+
name: "Update default version"
76+
kind: file
77+
sourceid: latest8xVersion
78+
scmid: default
79+
spec:
80+
file: internal/install/stack_version.go
81+
matchpattern: '(DefaultStackVersion =) "[^"]+"'
82+
replacepattern: '$1 "{{ source "latest8xVersion" }}"'
83+
update-package-registry-base-image:
84+
name: "Update Package Registry base image"
85+
kind: file
86+
sourceid: latestRegistryVersion
87+
scmid: default
88+
spec:
89+
file: internal/stack/resources.go
90+
matchpattern: '"(docker.elastic.co/package-registry/package-registry):v[0-9\.]+"'
91+
replacepattern: '"$1:{{ source "latestRegistryVersion" }}"'
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
scm:
3+
owner: elastic
4+
repository: elastic-package

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
4040
gopkg.in/yaml.v3 v3.0.1
4141
gotest.tools/gotestsum v1.11.0
42-
helm.sh/helm/v3 v3.15.0
42+
helm.sh/helm/v3 v3.15.1
4343
honnef.co/go/tools v0.4.7
4444
k8s.io/apimachinery v0.30.1
4545
k8s.io/cli-runtime v0.30.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,8 @@ gotest.tools/gotestsum v1.11.0 h1:A88/QWw7acMjZH1dMe6KZFhw32odUOIjCiAU/Q4n3mI=
618618
gotest.tools/gotestsum v1.11.0/go.mod h1:cUOKgFEvWAP0twchmiOvdzX0SBZX0UI58bGRpRIu4xs=
619619
gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=
620620
gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=
621-
helm.sh/helm/v3 v3.15.0 h1:gcLxHeFp0Hfo7lYi6KIZ84ZyvlAnfFRSJ8lTL3zvG5U=
622-
helm.sh/helm/v3 v3.15.0/go.mod h1:fvfoRcB8UKRUV5jrIfOTaN/pG1TPhuqSb56fjYdTKXg=
621+
helm.sh/helm/v3 v3.15.1 h1:22ztacHz4gMqhXNqCQ9NAg6BFWoRUryNLvnkz6OVyw0=
622+
helm.sh/helm/v3 v3.15.1/go.mod h1:fvfoRcB8UKRUV5jrIfOTaN/pG1TPhuqSb56fjYdTKXg=
623623
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
624624
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
625625
honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs=

0 commit comments

Comments
 (0)