Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v23.2.x' into backport-pr-1315…
Browse files Browse the repository at this point in the history
…5-v23.2.x-952
  • Loading branch information
joejulian committed Sep 19, 2023
2 parents f8571b3 + 625c020 commit 00e36cd
Show file tree
Hide file tree
Showing 101 changed files with 5,849 additions and 704 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/cloud-installpack-bk-trigger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: check formatting
on:
release:
types: [published]

jobs:
trigger-bump:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
repository: redpanda-data/sparse-checkout
token: ${{ secrets.ACTIONS_BOT_TOKEN }}
path: sparse-checkout

- uses: ./sparse-checkout
with:
repository: redpanda-data/vtools
token: ${{ secrets.ACTIONS_BOT_TOKEN }}
patterns: actions
path: ghca

- name: Trigger Versions Bump Buildkite Job
uses: ./ghca/actions/buildkite-pipeline-trigger
with:
buildkite_token: ${{ secrets.BUILDKITE_TOKEN }}
buildkite_org: redpanda
buildkite_pipeline: ${{ vars.CLOUD_PIPELINE }}
commit: HEAD
branch: ${{ vars.CLOUD_DEFAULT_BRANCH }}
message: Install Pack version bump trigger
env: '{"INSTALLPACK_BUMP": "1", "RELEASE_VERSION": "${{ github.ref_name }}"}'
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: actions/checkout@v3

- name: Install yapf
run: pip install yapf==0.32.0
run: pip install yapf==0.40.1

- name: Run yapf
run: find . -type f -name '*.py' | xargs -n8 yapf -d
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/redpanda-migration-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ on:
- '*'
pull_request:
branches:
- main
- dev
- 'v*'
paths:
- .github/workflows/redpanda-migration-build.yml
- src/go/cluster-to-redpanda-migration

jobs:
test:
name: Run tests
name: Test cluster-to-redpanda-migration
strategy:
matrix:
os: [linux, darwin, windows]
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/rpk-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ on:
- '*'
pull_request:
branches:
- main
- dev
- 'v*'
paths:
- .github/workflows/rpk-build.yml
- src/go/rpk

jobs:
test:
name: Run tests
name: Test rpk
strategy:
matrix:
os: [linux, darwin, windows]
Expand Down
8 changes: 4 additions & 4 deletions src/go/cluster-to-redpanda-migration/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/r3labs/diff/v3 v3.0.1
github.com/redpanda-data/redpanda/src/go/k8s v0.0.0-20230711000139-412f31a082ac
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
k8s.io/api v0.26.2
k8s.io/apimachinery v0.26.2
k8s.io/kubectl v0.26.0
Expand Down Expand Up @@ -45,7 +45,7 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -69,14 +69,14 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
7 changes: 5 additions & 2 deletions src/go/cluster-to-redpanda-migration/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
Expand Down Expand Up @@ -194,8 +195,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
Expand Down Expand Up @@ -250,6 +251,7 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down Expand Up @@ -335,6 +337,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
Expand Down
2 changes: 1 addition & 1 deletion src/go/k8s/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ linters:
enable:
- asciicheck
- bodyclose
- depguard
- dogsled
- dupl
- errcheck
Expand Down Expand Up @@ -83,6 +82,7 @@ linters:
# don't enable:
# - gochecknoinits # the kubebuilder and kubernetes library enforce using init functions
# - lll # the markers from controller-gen are 270 characters long
# - depguard
# - asciicheck
# - gochecknoglobals
# - gocognit
Expand Down
2 changes: 1 addition & 1 deletion src/go/k8s/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ KUSTOMIZE_VERSION ?= v4.5.7
CONTROLLER_TOOLS_VERSION ?= v0.4.1
KUTTL_VERSION ?= v0.15.0

GOLANGCI_LINT_VERSION ?= v1.52.2
GOLANGCI_LINT_VERSION ?= v1.54.2

.PHONY: controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
Expand Down
8 changes: 8 additions & 0 deletions src/go/k8s/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,12 @@ resources:
kind: Redpanda
path: github.com/redpanda-data/redpanda/src/go/k8s/apis/redpanda/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
controller: true
group: cluster.redpanda.com
kind: Topic
path: github.com/redpanda-data/redpanda/src/go/k8s/apis/cluster.redpanda.com/v1alpha1
version: v1alpha1
version: "3"
21 changes: 21 additions & 0 deletions src/go/k8s/apis/cluster.redpanda.com/v1alpha1/events_topic.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package v1alpha1

// These constants define valid event severity values.
const (
// EventTopicCreationFailure indicate and error when topic creation
// was not successful.
EventTopicCreationFailure string = "topicCreationFailure"
// EventTopicDeletionFailure indicate and error when topic deletion
// was not successful.
EventTopicDeletionFailure string = "topicDeletionFailure"
// EventTopicConfigurationAlteringFailure indicate and error when topic configuration altering
// was not successful.
EventTopicConfigurationAlteringFailure string = "topicConfigurationAlteringFailure"
// EventTopicConfigurationDescribeFailure indicate and error when topic configuration describe
// was not successful.
EventTopicConfigurationDescribeFailure string = "topicConfigurationDescribeFailure"
// EventTopicAlreadySynced indicate topic is already synced
EventTopicAlreadySynced string = "topicAlreadySynced"
// EventTopicSynced indicate topic is synced
EventTopicSynced string = "topicSynced"
)
29 changes: 29 additions & 0 deletions src/go/k8s/apis/cluster.redpanda.com/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright 2021-2023 Redpanda Data, Inc.
//
// Use of this software is governed by the Business Source License
// included in the file licenses/BSL.md
//
// As of the Change Date specified in that file, in accordance with
// the Business Source License, use of this software will be governed
// by the Apache License, Version 2.0

// Package v1alpha1 contains API Schema definitions for the cluster.redpanda.com v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=cluster.redpanda.com
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "cluster.redpanda.com", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
)
Loading

0 comments on commit 00e36cd

Please sign in to comment.