Skip to content

Commit

Permalink
Merge branch 'main' into renovate/cloud-bulldozer-kube-burner-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
odubajDT authored Aug 5, 2024
2 parents 76347c5 + 29c7c1c commit dc3da1e
Show file tree
Hide file tree
Showing 34 changed files with 143 additions and 148 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/generate-crd-docs/generate-crd-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Inputs: None

# renovate: datasource=github-releases depName=elastic/crd-ref-docs
GENERATOR_VERSION=v0.0.12
GENERATOR_VERSION=v0.1.0
API_DOMAIN="keptn.sh"
OPERATOR_API_ROOT='lifecycle-operator/apis/'
METRICS_API_ROOT='metrics-operator/api/'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ on:
permissions: read-all

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
CONTROLLER_TOOLS_VERSION: "v0.13.0"
CONTROLLER_TOOLS_VERSION: "v0.15.0"
ENVTEST_K8S_VERSION: "1.24.2"
SCHEDULER_COMPATIBLE_K8S_VERSION: "v0.24.3"
defaults:
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
outputs: type=oci,dest=/tmp/${{ matrix.config.name }}-image.tar

- name: Upload image as artifact
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: ${{ matrix.config.name }}-image.tar
path: /tmp/${{ matrix.config.name }}-image.tar
Expand All @@ -188,7 +188,7 @@ jobs:
run: echo "" > tag

- name: Upload tag for tests
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: dev-${{ env.DATETIME }}
path: tag
Expand Down Expand Up @@ -315,7 +315,7 @@ jobs:
run: rsync -av --delete --exclude='charts/*.tgz' ./${{ matrix.config.path }}/ ./helm-charts-repository/charts/${{ matrix.config.name }}/

- name: Create Pull Request
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
with:
token: ${{ secrets.KEPTN_BOT_TOKEN }}
path: ./helm-charts-repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/component-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
permissions: read-all

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"
defaults:
run:
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
permissions: read-all

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"
defaults:
run:
shell: bash
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Upload ${{ matrix.config.name }} cluster logs
if: always()
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: logs-e2e-tests-${{ matrix.config.name }}
path: .github/scripts/logs
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ permissions: read-all

env:
# renovate: datasource=github-releases depName=golangci/golangci-lint
GOLANGCI_LINT_VERSION: "v1.55.2"
GO_VERSION: "~1.21"
GOLANGCI_LINT_VERSION: "v1.59.1"
GO_VERSION: "~1.22"
jobs:
golangci-lint:
name: golangci-lint
Expand All @@ -49,7 +49,7 @@ jobs:
check-latest: true

- name: golangci-lint
uses: golangci/golangci-lint-action@d6238b002a20823d52840fda27e2d4891c5952dc # v4
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6
with:
working-directory: ${{ matrix.config.folder }}
version: ${{ env.GOLANGCI_LINT_VERSION }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-test-component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
permissions: read-all

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"
defaults:
run:
shell: bash
Expand All @@ -38,7 +38,7 @@ jobs:
uses: ./.github/actions/deploy-prometheus-on-cluster

- name: Install Chainsaw
uses: kyverno/action-install-chainsaw@7ad918efe13995d01bafa59aef8203a5246f5d04 # v0.2.7
uses: kyverno/action-install-chainsaw@82d8e747037f840e0ef9bdd97ecdc617f5535bdc # v0.2.8

- name: Run Integration Tests ${{ inputs.type }}
working-directory: .
Expand All @@ -51,7 +51,7 @@ jobs:

- name: Upload cluster logs
if: failure()
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: logs-integration-tests-${{ inputs.type }}
path: .github/scripts/logs
6 changes: 3 additions & 3 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
permissions: read-all

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"
defaults:
run:
shell: bash
Expand All @@ -43,7 +43,7 @@ jobs:
uses: ./.github/actions/deploy-prometheus-on-cluster

- name: Install Chainsaw
uses: kyverno/action-install-chainsaw@7ad918efe13995d01bafa59aef8203a5246f5d04 # v0.2.7
uses: kyverno/action-install-chainsaw@82d8e747037f840e0ef9bdd97ecdc617f5535bdc # v0.2.8

- name: Run Integration Tests
working-directory: .
Expand All @@ -56,7 +56,7 @@ jobs:

- name: Upload cluster logs
if: failure()
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: logs-integration-tests-${{ inputs.scheduling-gates }}-${{ inputs.cert-manager-io-enabled }}
path: .github/scripts/logs
6 changes: 3 additions & 3 deletions .github/workflows/load-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
permissions: read-all

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"
# renovate: datasource=github-tags depName=cloud-bulldozer/kube-burner
KUBE_BURNER_VERSION: "v1.10.5"
defaults:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Upload results
if: always()
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: load-tests-results
path: ./collected-metrics
Expand All @@ -69,7 +69,7 @@ jobs:

- name: Upload cluster logs
if: failure()
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: logs-load-tests
path: .github/scripts/logs
2 changes: 1 addition & 1 deletion .github/workflows/markdown-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
permissions: read-all

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"

defaults:
run:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ defaults:
shell: bash

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
CONTROLLER_TOOLS_VERSION: "v0.13.0"
CONTROLLER_TOOLS_VERSION: "v0.15.0"
SCHEDULER_COMPATIBLE_K8S_VERSION: "v0.24.3"
PUBLISHABLE_ITEMS: '[".","lifecycle-operator","metrics-operator","keptn-cert-manager","runtimes/deno-runtime","runtimes/python-runtime","scheduler"]'

Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
output-file: ./sbom-${{ matrix.config.name }}.spdx.json

- name: Attach SBOM to release
uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0 # v2.0.6
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
with:
tag_name: ${{ matrix.config.tagName }}
files: ./sbom-${{ matrix.config.name }}.spdx.json
Expand All @@ -237,7 +237,7 @@ jobs:
${{ env.IMAGE_NAME }}@${{ env.IMAGE_DIGEST }}
- name: Upload verification log as artifact
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: cosign-attest-verification-log
path: ./cosign-attest-output.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.5.3.4
with:
name: SARIF file
path: results.sarif
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/security-scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defaults:
shell: bash

env:
GO_VERSION: "~1.21"
GO_VERSION: "~1.22"

jobs:
prepare-security-scans:
Expand Down Expand Up @@ -65,14 +65,14 @@ jobs:
path: ./dist

- name: Upload tag
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: tag
path: |
./dist/dev-*/
- name: Upload images
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: images
path: |
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:

- name: Upload KICS results
if: always() && matrix.tool == 'kics'
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: kics-results
path: results.json
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
timeout: 5m
go: "~1.21"
go: "~1.22"
linters:
enable:
- gofmt # Gofmt checks whether code was gofmt-ed. By default, this tool runs with -s option to check for code simplification
Expand Down
2 changes: 1 addition & 1 deletion keptn-cert-manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.21.12-alpine3.19 AS builder
FROM --platform=$BUILDPLATFORM golang:1.22.5-alpine3.19 AS builder

ENV CGO_ENABLED=0

Expand Down
14 changes: 7 additions & 7 deletions keptn-cert-manager/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/keptn/lifecycle-toolkit/keptn-cert-manager

go 1.21
go 1.22

require (
github.com/go-logr/logr v1.4.2
Expand Down Expand Up @@ -31,7 +31,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
Expand All @@ -51,11 +51,11 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -73,6 +73,6 @@ require (
)

replace (
golang.org/x/net => golang.org/x/net v0.24.0
golang.org/x/net => golang.org/x/net v0.27.0
google.golang.org/protobuf => google.golang.org/protobuf v1.34.2
)
Loading

0 comments on commit dc3da1e

Please sign in to comment.