Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing macos sequoia build #288

Merged
merged 8 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
linter:
runs-on: ubuntu-latest
steps:
steps:
- name: Harden Runner
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09
with:
Expand All @@ -28,11 +28,11 @@ jobs:
storage.googleapis.com:443
uploads.github.com:443
sum.golang.org:443

- name: Setup Golang
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: "1.22"
go-version: "1.23"

- name: Checkout Git Repo
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
Expand All @@ -41,4 +41,4 @@ jobs:
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc
with:
version: v1.56.2
args: ./...
args: ./...
2 changes: 1 addition & 1 deletion .github/workflows/system-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: "1.22"
go-version: "1.23"

- name: Run integration Tests
run: make system-test
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,21 @@ jobs:
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09
with:
egress-policy: block
allowed-endpoints:
api.github.com:443
allowed-endpoints: api.github.com:443
github.com:443
proxy.golang.org:443
golang.org:443
go.dev:443
storage.googleapis.com:443
*.docker.io:443

- name: Setup Golang
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: "1.22"
go-version: "1.23"

- name: Checkout Git Repo
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: Run Unit Tests
run: make test
run: make test
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.22.0
ARG GO_VERSION=1.23.0
ARG XX_VERSION=1.2.1
ARG GOLANGCI_LINT_VERSION=v1.55.2

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ kubehound: | build ## Prepare kubehound (build go binary, deploy backend)
./bin/build/kubehound

.PHONY: test
test: ## Run the full suite of unit tests
test: ## Run the full suite of unit tests
cd pkg && go test -count=1 -race $(BUILD_FLAGS) ./...

.PHONY: system-test
Expand Down
2 changes: 1 addition & 1 deletion docs/dev-guide/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ make help

## Requirements build

- go (v1.22): https://go.dev/doc/install
- go (v1.23): https://go.dev/doc/install
- [Docker](https://docs.docker.com/engine/install/) >= 19.03 (`docker version`)
- [Docker Compose](https://docs.docker.com/compose/compose-file/compose-versioning/) >= v2.0 (`docker compose version`)

Expand Down
2 changes: 1 addition & 1 deletion docs/dev-guide/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ To ensure no regression in KubeHound, 2 kinds of tests are in place:

## Requirements test

- [Golang](https://go.dev/doc/install) `>= 1.22`
- [Golang](https://go.dev/doc/install) `>= 1.23`
- [Kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installing-with-a-package-manager)
- [Kubectl](https://kubernetes.io/docs/tasks/tools/)

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/DataDog/KubeHound

go 1.22.0
go 1.23.0

toolchain go1.22.1
toolchain go1.23

require (
github.com/DataDog/datadog-go/v5 v5.5.0
Expand Down Expand Up @@ -276,7 +276,7 @@ require (

require (
github.com/oklog/ulid/v2 v2.1.0
github.com/sirupsen/logrus v1.9.3
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/viper v1.19.0
golang.org/x/net v0.26.0 // indirect
golang.org/x/text v0.16.0 // indirect
Expand Down
Loading