Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
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/bundle-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12
id: go

- name: InstallKubebuilder
Expand Down Expand Up @@ -180,10 +180,10 @@ jobs:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12
id: go

- name: InstallKubebuilder
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/olm-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
- name: checkout
uses: actions/checkout@v2

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12
id: go

- name: InstallKubebuilder
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.25.11]
go-version: [1.25.12]
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12
id: go

- name: InstallKubebuilder
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-helm-charts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ jobs:
run: hack/kind-cluster-build.sh --name chart-testing -c 1 -v 10 --k8sVersion v1.23.17
if: steps.list-changed.outputs.changed == 'true'

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
if: steps.list-changed.outputs.changed == 'true'
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12
id: go

- name: setup kubebuilder 3.6.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-integration-skywalking-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ jobs:
- name: Report disk usage
run: df -h

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12

- name: Checkout
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ jobs:
repository: ${{github.event.pull_request.head.repo.full_name}}
ref: ${{ github.event.pull_request.head.sha }}

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12
id: go

- name: InstallKubebuilder
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy_scheduled_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ jobs:
repository: ${{github.event.pull_request.head.repo.full_name}}
ref: ${{ github.event.pull_request.head.sha }}

- name: Set up GO 1.25.11
- name: Set up GO 1.25.12
uses: actions/setup-go@v5
with:
go-version: 1.25.11
go-version: 1.25.12
id: go

- name: InstallKubebuilder
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.25.11-trixie AS builder
FROM --platform=$BUILDPLATFORM golang:1.25.12-trixie AS builder

ARG TARGETOS
ARG TARGETARCH
Expand Down
22 changes: 22 additions & 0 deletions api/compute/v1alpha1/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ type KafkaMessaging struct {

// +kubebuilder:validation:Optional
OutputSchemaConfig *KafkaSchemaConfig `json:"outputSchemaConfig,omitempty"`

// +kubebuilder:validation:Optional
SchemaRegistry *KafkaSchemaRegistryConfig `json:"schemaRegistry,omitempty"`
}

type KafkaTLSConfig struct {
Expand Down Expand Up @@ -126,6 +129,25 @@ type KafkaSchemaConfig struct {
Version *int32 `json:"version,omitempty"`
}

type KafkaSchemaRegistryConfig struct {
URL string `json:"url,omitempty"`
AuthConfig *KafkaSchemaRegistryAuthConfig `json:"authConfig,omitempty"`
}

type KafkaSchemaRegistryAuthConfig struct {
OAuth2Config *OAuth2Config `json:"oauth2Config,omitempty"`
BasicAuthConfig *KafkaSchemaRegistryBasicAuthConfig `json:"basicAuthConfig,omitempty"`
}

type KafkaSchemaRegistryBasicAuthConfig struct {
// The name of the k8s secret that contains the username and password for Schema Registry authentication.
// +kubebuilder:validation:Required
SecretName string `json:"secretName,omitempty"`
Comment thread
jiangpengcheng marked this conversation as resolved.
Outdated

UsernameKey string `json:"usernameKey,omitempty"`
PasswordKey string `json:"passwordKey,omitempty"`
}

func (c *PulsarTLSConfig) IsEnabled() bool {
return c.Enabled
}
Expand Down
65 changes: 65 additions & 0 deletions api/compute/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,43 @@ spec:
producerConfig:
type: object
x-kubernetes-preserve-unknown-fields: true
schemaRegistry:
properties:
authConfig:
properties:
basicAuthConfig:
properties:
passwordKey:
type: string
secretName:
type: string
usernameKey:
type: string
required:
- secretName
type: object
oauth2Config:
properties:
audience:
type: string
issuerUrl:
type: string
keySecretKey:
type: string
keySecretName:
type: string
scope:
type: string
required:
- audience
- issuerUrl
- keySecretKey
- keySecretName
type: object
type: object
url:
type: string
type: object
tlsConfig:
properties:
enabled:
Expand Down Expand Up @@ -4576,6 +4613,43 @@ spec:
producerConfig:
type: object
x-kubernetes-preserve-unknown-fields: true
schemaRegistry:
properties:
authConfig:
properties:
basicAuthConfig:
properties:
passwordKey:
type: string
secretName:
type: string
usernameKey:
type: string
required:
- secretName
type: object
oauth2Config:
properties:
audience:
type: string
issuerUrl:
type: string
keySecretKey:
type: string
keySecretName:
type: string
scope:
type: string
required:
- audience
- issuerUrl
- keySecretKey
- keySecretName
type: object
type: object
url:
type: string
type: object
tlsConfig:
properties:
enabled:
Expand Down Expand Up @@ -8430,6 +8504,43 @@ spec:
producerConfig:
type: object
x-kubernetes-preserve-unknown-fields: true
schemaRegistry:
properties:
authConfig:
properties:
basicAuthConfig:
properties:
passwordKey:
type: string
secretName:
type: string
usernameKey:
type: string
required:
- secretName
type: object
oauth2Config:
properties:
audience:
type: string
issuerUrl:
type: string
keySecretKey:
type: string
keySecretName:
type: string
scope:
type: string
required:
- audience
- issuerUrl
- keySecretKey
- keySecretName
type: object
type: object
url:
type: string
type: object
tlsConfig:
properties:
enabled:
Expand Down
Loading
Loading