Skip to content

Commit eb41bc3

Browse files
committed
Merge branch 'master' into feature/multiple-e2e-variants
2 parents e8a1ef2 + a7ec802 commit eb41bc3

File tree

29 files changed

+1692
-762
lines changed

29 files changed

+1692
-762
lines changed

.github/workflows/backend-lint-test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ jobs:
2323
runs-on: ubuntu-latest-4
2424
steps:
2525
- uses: actions/checkout@v5
26-
- uses: actions/setup-go@v5
26+
- uses: actions/setup-go@v6
2727
with:
28-
# go-version: 'stable'
2928
go-version-file: 'backend/go.mod'
3029
- name: golangci-lint
3130
uses: golangci/golangci-lint-action@v8

.github/workflows/frontend-verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ jobs:
200200
REACT_APP_DEV_HINT=true
201201
bun run build
202202
- name: Setup Go
203-
uses: actions/setup-go@v4
203+
uses: actions/setup-go@v6
204204
with:
205-
go-version: '1.22'
205+
go-version-file: 'backend/go.mod'
206206
cache-dependency-path: backend/go.sum
207207
- name: Install Playwright browsers
208208
run: bun run install:chromium

backend/pkg/console/endpoint_compatibility.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919

2020
"github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/console/v1alpha1/consolev1alpha1connect"
2121
"github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1/dataplanev1connect"
22+
"github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha3/dataplanev1alpha3connect"
2223
"github.com/redpanda-data/console/backend/pkg/version"
2324
)
2425

@@ -206,11 +207,18 @@ func (s *Service) GetEndpointCompatibility(ctx context.Context) (EndpointCompati
206207
}
207208

208209
// OSS defaults
209-
endpoints = append(endpoints, EndpointCompatibilityEndpoint{
210-
Endpoint: consolev1alpha1connect.PipelineServiceName,
211-
Method: "POST",
212-
IsSupported: false,
213-
})
210+
endpoints = append(endpoints,
211+
EndpointCompatibilityEndpoint{
212+
Endpoint: consolev1alpha1connect.PipelineServiceName,
213+
Method: "POST",
214+
IsSupported: false,
215+
},
216+
EndpointCompatibilityEndpoint{
217+
Endpoint: dataplanev1alpha3connect.TracingServiceName,
218+
Method: "POST",
219+
IsSupported: false,
220+
},
221+
)
214222

215223
return EndpointCompatibility{
216224
KafkaClusterVersion: clusterVersion,

backend/pkg/protogen/redpanda/api/dataplane/v1/security.pb.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)