Skip to content

Commit

Permalink
Merge branch 'main' into memcached-pvc-labels
Browse files Browse the repository at this point in the history
  • Loading branch information
sousa-andre authored Jan 18, 2025
2 parents be0f932 + 7cb8dd6 commit f344b95
Show file tree
Hide file tree
Showing 892 changed files with 56,294 additions and 31,592 deletions.
22 changes: 22 additions & 0 deletions .github/actions/setup-k3d/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Setup K3D Cluster
description: Setup a K3D cluster

runs:
using: "composite"
steps:

- name: Install k3d
shell: bash
run: |
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
- name: Create k3d cluster with local registry
shell: bash
run: |
k3d registry create registry.local --port 5000
k3d cluster create k3d-cluster --registry-use k3d-registry.local:5000
- name: Set kubectl context to k3d cluster
shell: bash
run: |
k3d kubeconfig merge k3d-cluster --kubeconfig-switch-context
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.34.3"
"build_image": "grafana/loki-build-image:0.34.4"
"golang_ci_lint_version": "v1.60.3"
"release_lib_ref": "main"
"skip_validation": false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-pr-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
deploy-pr-preview:
if: github.repository == 'grafana/loki'
if: ${{ ! github.event.pull_request.head.repo.fork }}
uses: grafana/writers-toolkit/.github/workflows/deploy-preview.yml@main
with:
sha: ${{ github.event.pull_request.head.sha }}
Expand Down
Loading

0 comments on commit f344b95

Please sign in to comment.