Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
toschneck committed Sep 19, 2024
2 parents 46563a5 + 8a0bcee commit 2a8aa3f
Show file tree
Hide file tree
Showing 113 changed files with 2,341 additions and 771 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
uses: actions/setup-go@bfd2fb341f32be7281829126376a12a780ca79fc
with:
go-version: 1.22.3
- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
# see: https://golangci-lint.run/usage/configuration/#config-file
- name: golangci-lint
uses: golangci/golangci-lint-action@68de804037d6beb4bec814041c98865cb188f3db
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 0
- uses: heinrichreimer/github-changelog-generator-action@981f332491452b16b2127a8bbe19358fdde7e60d
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/curldemo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 1
- name: Login to Dockerhub
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout code
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc

- name: Run FOSSA scan and upload build data
uses: fossa-contrib/fossa-action@eaa7ead45540cff770b815fdf6bcea019539370b
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 0
- name: Copy new docs to gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm_check-values-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: 'Checkout'
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
- name: 'Check if values.schema.json was updated'
run: |
VALUES_FILE=chart/k8gb/values.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout Code
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
- name: Generate docs for helm chart - chart/k8gb/README.md
uses: docker://jnorwood/helm-docs@sha256:7e562b49ab6b1dbc50c3da8f2dd6ffa8a5c6bba327b1c6335cc15ce29267979c
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 0
- uses: dave-mcconnell/helm-gh-pages-microservices@8478af5f0fd712cc0fb59f2c99e0688f3f591287
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kube-linter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc

- name: Create ../results directory for sarif files
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/olm_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 0

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
rm ./olm/bundle/Dockerfile
cp -r ./olm/bundle $GITHUB_WORKSPACE/
- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
repository: ${{ github.event.inputs.upstreamRepo }}
path: sandbox
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terrascan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
- name: Run Terrascan
id: terrascan
uses: accurics/terrascan-action@a4b0f7ec5fb3c4c66b8e76d824d958002f6ce12c
Expand Down
80 changes: 80 additions & 0 deletions .github/workflows/terratest-istiov1beta1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: Terratest for istio's v1beta1 API version

on:
pull_request:
types:
- labeled

permissions:
contents: read

jobs:
terratest-istio:
runs-on: ubuntu-22.04
if: ${{ github.event.label.name == 'istio' }}
steps:
- name: Checkout
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
with:
fetch-depth: 0

- name: Set networking.istio.io/v1beta1 API version
run: |
find . -name "*.yaml" -exec sed -i 's/networking\.istio\.io\/v1/networking.istio.io\/v1beta1/g' {} +
- name: Setup Golang
uses: actions/setup-go@bfd2fb341f32be7281829126376a12a780ca79fc
with:
go-version: 1.22.3

- name: Build artifacts
uses: goreleaser/goreleaser-action@006a7a4111c6a1b44a25a1f3d23f0c8d940ad847
with:
version: v1.9.2
args: release --rm-dist --skip-publish --skip-validate --snapshot --skip-sbom --skip-sign
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create edgeDNS k3s Cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79
with:
cluster-name: "edgedns"
args: -c k3d/edge-dns.yaml

- name: Create 1st k3s Cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79
with:
cluster-name: "test-gslb1"
args: -c k3d/test-gslb1.yaml

- name: Create 2nd k3s Cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79
with:
cluster-name: "test-gslb2"
args: -c k3d/test-gslb2.yaml

- name: K8GB deployment
run: |
make deploy-test-version list-running-pods
echo "Cluster 1 (eu):"
kubectl get no -owide --context=k3d-test-gslb1
echo "Cluster 2 (us):"
kubectl get no -owide --context=k3d-test-gslb2
- name: Run Terratest
run: |
mkdir -p ${{ github.workspace }}/tmp/terratest
set -o pipefail
echo "::group::Terratest logs"
make terratest | tee ${{ github.workspace }}/tmp/terratest/all.log
echo "::endgroup::"
- name: Print debug info
if: always()
uses: ./.github/actions/print-debug

- uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
if: always()
with:
name: terratest-logs
path: ${{ github.workspace }}/tmp/terratest
4 changes: 2 additions & 2 deletions .github/workflows/terratest-more-clusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04
if: ${{ github.event.label.name == 'heavy-tests' }}
steps:
- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 0

Expand All @@ -22,7 +22,7 @@ jobs:
go-version: 1.22.3

- name: Build artifacts
uses: goreleaser/goreleaser-action@d33b6f6aeabd7fed8bb3fbf32c4d890d29f48545
uses: goreleaser/goreleaser-action@006a7a4111c6a1b44a25a1f3d23f0c8d940ad847
with:
version: v1.7.0
args: release --rm-dist --skip-publish --skip-validate --snapshot --skip-sbom --skip-sign
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/terratest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,18 @@ jobs:
needs: skip-check
if: ${{ needs.skip-check.outputs.should_skip != 'true' }} && !contains( github.event.pull_request.labels.*.name, 'renovate')
steps:
- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- name: Checkout
uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 0

- uses: actions/setup-go@bfd2fb341f32be7281829126376a12a780ca79fc
- name: Setup golang
uses: actions/setup-go@bfd2fb341f32be7281829126376a12a780ca79fc
with:
go-version: 1.22.3

- name: Build artifacts
uses: goreleaser/goreleaser-action@d33b6f6aeabd7fed8bb3fbf32c4d890d29f48545
uses: goreleaser/goreleaser-action@006a7a4111c6a1b44a25a1f3d23f0c8d940ad847
with:
version: v1.9.2
args: release --rm-dist --skip-publish --skip-validate --snapshot --skip-sbom --skip-sign
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upgrade-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
needs: skip-check
if: ${{ needs.skip-check.outputs.should_skip != 'true' }} && !contains( github.event.pull_request.labels.*.name, 'renovate')
steps:
- uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
- uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
with:
fetch-depth: 0

Expand All @@ -53,7 +53,7 @@ jobs:
go-version: 1.22.3

- name: Build artifacts
uses: goreleaser/goreleaser-action@d33b6f6aeabd7fed8bb3fbf32c4d890d29f48545
uses: goreleaser/goreleaser-action@006a7a4111c6a1b44a25a1f3d23f0c8d940ad847
with:
version: v1.9.2
args: release --rm-dist --skip-publish --skip-validate --snapshot --skip-sbom --skip-sign
Expand Down
23 changes: 12 additions & 11 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ linters:
- dupl
- gochecknoinits

# don't enable:
# - golint # deprecated
# - whitespace
# - funlen
# - exhaustive
# - gomnd
# - gofmt
# - deadcode # deprecated since v1.49.0
# - structcheck # deprecated since v1.49.0
# - varcheck # deprecated since v1.49.0
# - rowserrcheck # rowserrcheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649
# don't enable:
# - golint # deprecated
# - whitespace
# - funlen
# - exhaustive
# - gomnd
# - gofmt
# - deadcode # deprecated since v1.49.0
# - structcheck # deprecated since v1.49.0
# - varcheck # deprecated since v1.49.0
# - rowserrcheck # rowserrcheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649

run:
deadline: 3m
Expand All @@ -55,6 +55,7 @@ linters-settings:
main:
allow:
- $gostd
- istio.io/client-go
- k8s.io/apimachinery
- k8s.io/client-go
- k8s.io/api
Expand Down
Loading

0 comments on commit 2a8aa3f

Please sign in to comment.