Skip to content

Commit

Permalink
Merge branch 'main' into revive-max-chunks-per-query
Browse files Browse the repository at this point in the history
  • Loading branch information
Junyoung Park committed Mar 11, 2024
2 parents a6924c1 + f6cfff5 commit ece159a
Show file tree
Hide file tree
Showing 381 changed files with 26,355 additions and 19,919 deletions.
284 changes: 1 addition & 283 deletions .drone/drone.jsonnet

Large diffs are not rendered by default.

765 changes: 7 additions & 758 deletions .drone/drone.yml

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions .github/jsonnetfile.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"dependencies": [
{
"source": {
"git": {
"remote": "https://github.com/grafana/loki-release.git",
"subdir": "workflows"
}
},
"version": "release-1.10.x"
}
],
"legacyImports": true
}
16 changes: 16 additions & 0 deletions .github/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": 1,
"dependencies": [
{
"source": {
"git": {
"remote": "https://github.com/grafana/loki-release.git",
"subdir": "workflows"
}
},
"version": "c005223f58b83f288b655dde5bcfeff7490c7aa5",
"sum": "5K+r6Bsb8JMR1ytQjSObjvHFpH7SJBi5D4ysSwvC4/g="
}
],
"legacyImports": false
}
58 changes: 58 additions & 0 deletions .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;
{
'patch-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
imageJobs={
loki: build.image('loki', 'cmd/loki'),
fluentd: build.image('fluentd', 'clients/cmd/fluentd', platform=['linux/amd64']),
'fluent-bit': build.image('fluent-bit', 'clients/cmd/fluent-bit', platform=['linux/amd64']),
logstash: build.image('logstash', 'clients/cmd/logstash', platform=['linux/amd64']),
logcli: build.image('logcli', 'cmd/logcli'),
'loki-canary': build.image('loki-canary', 'cmd/loki-canary'),
'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
'loki-operator': build.image('loki-operator', 'operator', context='release/operator', platform=['linux/amd64']),
promtail: build.image('promtail', 'clients/cmd/promtail'),
querytee: build.image('querytee', 'cmd/querytee', platform=['linux/amd64']),
},
branches=['release-[0-9]+.[0-9]+.x'],
checkTemplate='grafana/loki-release/.github/workflows/check.yml@release-1.10.x',
imagePrefix='grafana',
releaseRepo='grafana/loki',
skipArm=false,
skipValidation=false,
versioningStrategy='always-bump-patch',
), false, false
),
'minor-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
imageJobs={
loki: build.image('loki', 'cmd/loki'),
fluentd: build.image('fluentd', 'clients/cmd/fluentd', platform=['linux/amd64']),
'fluent-bit': build.image('fluent-bit', 'clients/cmd/fluent-bit', platform=['linux/amd64']),
logstash: build.image('logstash', 'clients/cmd/logstash', platform=['linux/amd64']),
logcli: build.image('logcli', 'cmd/logcli'),
'loki-canary': build.image('loki-canary', 'cmd/loki-canary'),
'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
'loki-operator': build.image('loki-operator', 'operator', context='release/operator', platform=['linux/amd64']),
promtail: build.image('promtail', 'clients/cmd/promtail'),
querytee: build.image('querytee', 'cmd/querytee', platform=['linux/amd64']),
},
branches=['k[0-9]+'],
checkTemplate='grafana/loki-release/.github/workflows/check.yml@release-1.10.x',
imagePrefix='grafana',
releaseRepo='grafana/loki',
skipArm=false,
skipValidation=false,
versioningStrategy='always-bump-minor',
), false, false
),
'release.yml': std.manifestYamlDoc(
lokiRelease.releaseWorkflow(
branches=['release-[0-9]+.[0-9]+.x', 'k[0-9]+'],
getDockerCredsFromVault=true,
imagePrefix='grafana',
releaseRepo='grafana/loki',
), false, false
),
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ece159a

Please sign in to comment.