-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into log-4550-aws
- Loading branch information
Showing
4,162 changed files
with
504,411 additions
and
238,308 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
| "subdir": "workflows" | ||
| } | ||
| }, | ||
| "version": "release-1.10.x" | ||
| "version": "main" | ||
| } | ||
| ], | ||
| "legacyImports": true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,99 @@ | ||
| local lokiRelease = import 'workflows/main.jsonnet'; | ||
| local build = lokiRelease.build; | ||
|
|
||
| local releaseLibRef = std.filter( | ||
| function(dep) dep.source.git.remote == 'https://github.com/grafana/loki-release.git', | ||
| (import 'jsonnetfile.json').dependencies | ||
| )[0].version; | ||
|
|
||
| local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef; | ||
|
|
||
| local imageJobs = { | ||
| loki: build.image('loki', 'cmd/loki'), | ||
| fluentd: build.image('fluent-plugin-loki', 'clients/cmd/fluentd', platform=['linux/amd64']), | ||
| 'fluent-bit': build.image('fluent-bit-plugin-loki', 'clients/cmd/fluent-bit', platform=['linux/amd64']), | ||
| logstash: build.image('logstash-output-loki', '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'), | ||
| promtail: build.image('promtail', 'clients/cmd/promtail'), | ||
| querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']), | ||
| }; | ||
|
|
||
| local buildImage = 'grafana/loki-build-image:0.33.1'; | ||
| local golangCiLintVersion = 'v1.55.1'; | ||
|
|
||
| local imageBuildTimeoutMin = 40; | ||
| local imagePrefix = 'grafana'; | ||
|
|
||
| { | ||
| '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/[email protected]', | ||
| imagePrefix='grafana', | ||
| buildImage=buildImage, | ||
| checkTemplate=checkTemplate, | ||
| golangCiLintVersion=golangCiLintVersion, | ||
| imageBuildTimeoutMin=imageBuildTimeoutMin, | ||
| imageJobs=imageJobs, | ||
| imagePrefix=imagePrefix, | ||
| releaseLibRef=releaseLibRef, | ||
| releaseRepo='grafana/loki', | ||
| skipArm=false, | ||
| skipValidation=false, | ||
| useGitHubAppToken=true, | ||
| versioningStrategy='always-bump-patch', | ||
| ), false, false | ||
| ) + { | ||
| name: 'Prepare Patch Release PR', | ||
| }, 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/[email protected]', | ||
| imagePrefix='grafana', | ||
| buildImage=buildImage, | ||
| checkTemplate=checkTemplate, | ||
| golangCiLintVersion=golangCiLintVersion, | ||
| imageBuildTimeoutMin=imageBuildTimeoutMin, | ||
| imageJobs=imageJobs, | ||
| imagePrefix=imagePrefix, | ||
| releaseLibRef=releaseLibRef, | ||
| releaseRepo='grafana/loki', | ||
| skipArm=false, | ||
| skipValidation=false, | ||
| useGitHubAppToken=true, | ||
| versioningStrategy='always-bump-minor', | ||
| ), false, false | ||
| ) + { | ||
| name: 'Prepare Minor Release PR from Weekly', | ||
| }, false, false | ||
| ), | ||
| 'release.yml': std.manifestYamlDoc( | ||
| lokiRelease.releaseWorkflow( | ||
| branches=['release-[0-9]+.[0-9]+.x', 'k[0-9]+'], | ||
| branches=['release-[0-9]+.[0-9]+.x', 'k[0-9]+', 'main'], | ||
| getDockerCredsFromVault=true, | ||
| imagePrefix='grafana', | ||
| releaseLibRef=releaseLibRef, | ||
| releaseRepo='grafana/loki', | ||
| useGitHubAppToken=false, | ||
| ), false, false | ||
| ), | ||
| 'check.yml': std.manifestYamlDoc({ | ||
| name: 'check', | ||
| on: { | ||
| pull_request: {}, | ||
| push: { | ||
| branches: ['main'], | ||
| }, | ||
| }, | ||
| jobs: { | ||
| check: { | ||
| uses: checkTemplate, | ||
| with: { | ||
| build_image: buildImage, | ||
| golang_ci_lint_version: golangCiLintVersion, | ||
| release_lib_ref: releaseLibRef, | ||
| skip_validation: false, | ||
| use_github_app_token: true, | ||
| }, | ||
| }, | ||
| }, | ||
| }), | ||
| } |
Oops, something went wrong.