Revert "Squashed commit of the following:"

This reverts commit b9e647f.
grafana · Aug 12, 2024 · 93ece4f · 93ece4f
1 parent b9e647f
commit 93ece4f
Show file tree

Hide file tree

Showing 1,538 changed files with 281,543 additions and 307,302 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "image": "grafana/loki-build-image:0.33.6",
+  "image": "grafana/loki-build-image:0.33.4",
   "containerEnv": {
     "BUILD_IN_CONTAINER": "false"
   },

diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -139,7 +139,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.33.6
+  image: grafana/loki-build-image:0.33.4
   name: documentation-helm-reference-check
 trigger:
   ref:
@@ -1085,7 +1085,7 @@ steps:
       from_secret: docker_password
     DOCKER_USERNAME:
       from_secret: docker_username
-  image: grafana/loki-build-image:0.33.6
+  image: grafana/loki-build-image:0.33.4
   name: build and push
   privileged: true
   volumes:
@@ -1308,6 +1308,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 3b3b039769ab8c44318749efec569ffe50c4cfb173f577422ec9d514054f0a9e
+hmac: 335170654951c8fdd9cb1b96b4290febb74b86ebab07cfe65d680299faa767bf
 
 ...
diff --git a/.github/jsonnetfile.json b/.github/jsonnetfile.json
@@ -8,7 +8,7 @@
           "subdir": "workflows"
         }
       },
-      "version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56"
+      "version": "adca1c07a2199374e1646e62331926509699368b"
     }
   ],
   "legacyImports": true

diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56",
-      "sum": "kVlVZPpPz8d/D6UGK9Hto+NeGy7z8NvGygcB1QboxWw="
+      "version": "adca1c07a2199374e1646e62331926509699368b",
+      "sum": "/6NMt3DFr1mpaBxncbwBJVV5vBpAMIyP3XNOoFArz5Q="
     }
   ],
   "legacyImports": false

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -5,7 +5,7 @@
     ],
     "labels": ["dependencies"],
     "prHourlyLimit": 4,
-    "baseBranches": ["main"],
+    "baseBranches": ["main", "release-2.9.x", "release-2.8.x"],
     "packageRules": [
       {
         "matchBaseBranches": ["release-2.9.x","release-2.8.x"],

diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -2,7 +2,7 @@
   "check":
     "uses": "grafana/loki-release/.github/workflows/check.yml@main"
     "with":
-      "build_image": "grafana/loki-build-image:0.33.6"
+      "build_image": "grafana/loki-build-image:0.33.4"
       "golang_ci_lint_version": "v1.55.1"
       "release_lib_ref": "main"
       "skip_validation": false

diff --git a/.github/workflows/helm-ci.yml b/.github/workflows/helm-ci.yml
@@ -60,7 +60,7 @@ jobs:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.1
+        uses: helm/chart-testing-action@v2.6.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed

diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@main"
     with:
-      build_image: "grafana/loki-build-image:0.33.6"
+      build_image: "grafana/loki-build-image:0.33.4"
       golang_ci_lint_version: "v1.55.1"
       release_lib_ref: "main"
       skip_validation: false
@@ -101,8 +101,6 @@ jobs:
       version: "${{ needs.version.outputs.version }}"
     runs-on: "ubuntu-latest"
     steps:
-    - name: "clean up build tools cache"
-      run: "rm -rf /opt/hostedtoolcache"
     - name: "pull code to release"
       uses: "actions/checkout@v4"
       with:
@@ -143,7 +141,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.33.6"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages

diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@main"
     with:
-      build_image: "grafana/loki-build-image:0.33.6"
+      build_image: "grafana/loki-build-image:0.33.4"
       golang_ci_lint_version: "v1.55.1"
       release_lib_ref: "main"
       skip_validation: false
@@ -101,8 +101,6 @@ jobs:
       version: "${{ needs.version.outputs.version }}"
     runs-on: "ubuntu-latest"
     steps:
-    - name: "clean up build tools cache"
-      run: "rm -rf /opt/hostedtoolcache"
     - name: "pull code to release"
       uses: "actions/checkout@v4"
       with:
@@ -143,7 +141,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.33.6"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  ".": "3.1.1",
+  ".": "3.0.0",
   "operator": "0.6.1"
 }