Skip to content

Commit

Permalink
Merge branch 'main' into david/node-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
orishavit authored Oct 6, 2024
2 parents 097d8f7 + 8474100 commit b23a545
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 308 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: Install go-junit-report
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: Install go-junit-report
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: Install go-junit-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: go vet
Expand All @@ -42,7 +42,7 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.55.2
version: v1.61.0

# Optional: working directory, useful for monorepos
working-directory: tests
Expand Down
4 changes: 2 additions & 2 deletions intents-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: intents-operator
description: Otterize intents operator
type: application
version: 3.0.39
appVersion: v2.0.22
version: 3.0.40
appVersion: v2.0.23
home: https://github.com/otterize/intents-operator
sources:
- https://github.com/otterize/intents-operator
4 changes: 2 additions & 2 deletions network-mapper/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: network-mapper
type: application
version: 2.0.22
appVersion: v2.0.9
version: 2.0.23
appVersion: v2.0.10
home: https://github.com/otterize/network-mapper
sources:
- https://github.com/otterize/network-mapper
2 changes: 1 addition & 1 deletion otterize-kubernetes/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: otterize-kubernetes
description: |
This chart contains the Otterize credentials-operator, SPIRE (server+agent), the Otterize intents operator, and the Otterize network mapper.
type: application
version: 4.0.42
version: 4.0.46
home: https://github.com/otterize/helm-charts
kubeVersion: ">=1.19.0-0"
dependencies:
Expand Down
292 changes: 0 additions & 292 deletions tests/azureiam/files/terraform/terraform.tfstate

This file was deleted.

2 changes: 1 addition & 1 deletion tests/base_suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ func (s *BaseSuite) ReadPodLogsUntilSubstring(ctx context.Context, pod *corev1.P
default:
for reader.Scan() {
line = reader.Text()
logger.Debugf(line)
logger.Debugf("%s", line)
if strings.Contains(line, substring) {
logger.Infof("Matched log line: %s", line)
return
Expand Down
2 changes: 1 addition & 1 deletion tests/databases/mysql/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.1-alpine
FROM golang:1.23.1-alpine
WORKDIR /app
ADD tests/go.mod .
ADD tests/go.sum .
Expand Down
2 changes: 1 addition & 1 deletion tests/databases/postgresql/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.1-alpine
FROM golang:1.23.1-alpine
WORKDIR /app
ADD tests/go.mod .
ADD tests/go.sum .
Expand Down
4 changes: 1 addition & 3 deletions tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module helm_tests

go 1.22.1

toolchain go1.22.3
go 1.23.1

require (
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0
Expand Down

0 comments on commit b23a545

Please sign in to comment.