Skip to content

Commit

Permalink
Merge branch 'main' into jdb/2024-10-remove-add-to-docs-project-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
chaudum authored Dec 20, 2024
2 parents 85856ca + 6c49cc0 commit c05fad2
Show file tree
Hide file tree
Showing 5,552 changed files with 688,590 additions and 301,424 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.34.0",
"image": "grafana/loki-build-image:0.34.1",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},
Expand Down
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "d900569c04b53e02de6ef208fa77cba41ec5f709"
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "d900569c04b53e02de6ef208fa77cba41ec5f709",
"sum": "+uAzU+b+aJtp3k+JX5mDxuh8LNY23+cHvUOwzCQ8CS8="
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae",
"sum": "tml1dcFlo15kEE6JvN/nPY2xkhfeF3ERZjAyFbnguHA="
}
],
"legacyImports": false
Expand Down
23 changes: 9 additions & 14 deletions .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;

local build = lokiRelease.build;
local releaseLibRef = 'main';

local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
local golangCiLintVersion = 'v1.60.3';
local imageBuildTimeoutMin = 60;
local imagePrefix = 'grafana';
local dockerPluginDir = 'clients/cmd/docker-driver';

local imageJobs = {
loki: build.image('loki', 'cmd/loki'),
Expand All @@ -15,27 +20,16 @@ local imageJobs = {
'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']),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=['linux/amd64', 'linux/arm64']),
};

local weeklyImageJobs = {
loki: build.weeklyImage('loki', 'cmd/loki'),
fluentd: build.weeklyImage('fluent-plugin-loki', 'clients/cmd/fluentd', platform=['linux/amd64']),
'fluent-bit': build.weeklyImage('fluent-bit-plugin-loki', 'clients/cmd/fluent-bit', platform=['linux/amd64']),
logstash: build.weeklyImage('logstash-output-loki', 'clients/cmd/logstash', platform=['linux/amd64']),
logcli: build.weeklyImage('logcli', 'cmd/logcli'),
'loki-canary': build.weeklyImage('loki-canary', 'cmd/loki-canary'),
'loki-canary-boringcrypto': build.weeklyImage('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
promtail: build.weeklyImage('promtail', 'clients/cmd/promtail'),
querytee: build.weeklyImage('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
};

local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
local golangCiLintVersion = 'v1.60.3';

local imageBuildTimeoutMin = 60;
local imagePrefix = 'grafana';

{
'patch-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
Expand Down Expand Up @@ -81,6 +75,7 @@ local imagePrefix = 'grafana';
getDockerCredsFromVault=true,
imagePrefix='grafana',
releaseLibRef=releaseLibRef,
pluginBuildDir=dockerPluginDir,
releaseRepo='grafana/loki',
useGitHubAppToken=true,
), false, false
Expand Down
36 changes: 0 additions & 36 deletions .github/renovate.json

This file was deleted.

91 changes: 91 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"labels": [
"dependencies"
],
"prHourlyLimit": 4,
"baseBranches": [
"main"
],
"packageRules": [
{
"matchBaseBranches": [
"release-2.9.x",
"release-2.8.x"
],
"enabled": false,
"matchPackageNames": [
"*"
]
},
{
// Disable Go version updates
"matchManagers": ["gomod"],
"matchPackageNames": ["go", "toolchain"],
"enabled": false
},
{
// Disable Go and loki-build-image updates for Dockerfiles
"matchManagers": ["dockerfile"],
"matchPackageNames": ["golang", "grafana/loki-build-image"],
"enabled": false
},
{
// Don't automatically merge GitHub Actions updates
"matchManagers": ["github-actions"],
"enabled": true,
"matchUpdateTypes": ["major", "minor", "patch"],
"autoApprove": false,
"automerge": false
},
{
// Separate out Helm updates from other dependencies
// Don't automatically merge Helm updates
// Updates to this require the docs to be updated
"matchManagers": ["helm-requirements", "helm-values", "helmv3"],
"groupName": "helm-{{packageName}}",
"matchUpdateTypes": ["major", "minor", "patch"],
"matchPackageNames": ["!grafana/loki"], // This is updated via a different job
"autoApprove": false,
"automerge": false
},
{
// Disable operator updates
"matchFileNames": ["operator/go.mod", "operator/api/loki/go.mod"],
"enabled": false,
"autoApprove": false,
"automerge": false
},
{
// Enable all other updates
"matchFileNames": ["!operator/go.mod", "!operator/api/loki/go.mod"],
"groupName": "{{packageName}}",
"enabled": true,
"matchUpdateTypes": ["major", "minor", "patch"],
// After we have tested the above configuration, we can enable the following
"automerge": false,
"autoApprove": false
}
],
"digest": {
"enabled": false
},
"vulnerabilityAlerts": {
"enabled": true,
"addLabels": [
"area/security"
]
},
"osvVulnerabilityAlerts": true,
"prConcurrentLimit": 10,
"rebaseWhen": "conflicted",
"branchPrefix": "deps-update/",
"postUpdateOptions": [
"gomodTidy"
],
"semanticCommitType": "fix",
"semanticCommitScope": "deps"
}

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.

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 c05fad2

Please sign in to comment.