8000 Update k8s.io/client-go to version 0.30.14 by dcoppa · Pull Request #1970 · Altinity/clickhouse-operator · GitHub
[go: up one dir, main page]
Skip to content

Update k8s.io/client-go to version 0.30.14 #1970

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.

Sign up for GitHub

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

Merged
sunsingerus merged 2 commits into from
May 4, 2026
Merged

Update k8s.io/client-go to version 0.30.14 #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a31420
Update k8s.io/client-go to version 0.30.14
dcoppa Apr 26, 2026
bf0699f
Port dev/run_code_generator.sh to kube_codegen.sh and fix deepcopy ga…
dcoppa Apr 28, 2026
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
6 changes: 5 additions & 1 deletion cmd/operator/app/thread_keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,18 @@ func initKeeper(ctx context.Context) error {
return err
}

defaultNamespaces := make(map[string]cache.Config)
for _, ns := range chop.Config().GetCacheNamespaces() {
defaultNamespaces[ns] = cache.Config{}
}
manager, err = ctrlRuntime.NewManager(ctrlRuntime.GetConfigOrDie(), ctrlRuntime.Options{
Scheme: scheme,
Cache: cache.Options{
// GetCacheNamespaces returns exact namespace names when all configured watch namespaces are
// valid DNS labels, enabling per-namespace cache scoping. Falls back to NamespaceAll when
// any watch namespace is a regexp pattern (the controller's Reconcile guard handles filtering
// in that case).
Namespaces: chop.Config().GetCacheNamespaces(),
DefaultNamespaces: defaultNamespaces,
},
})
if err != nil {
Expand Down
4 changes: 0 additions & 4 deletions dev/go_build_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ MANIFESTS_ROOT="${SRC_ROOT}/deploy"
CMD_ROOT="${SRC_ROOT}/cmd"
# Packages root
PKG_ROOT="${SRC_ROOT}/pkg"
# Local temp folder root
LOCAL_TMP_ROOT="${SRC_ROOT}/tmp"
# Place where generator should produce code. It will be copied afterwards
GENERATOR_ROOT="${LOCAL_TMP_ROOT}/generator"

REPO="github.com/altinity/clickhouse-operator"

Expand Down
38 changes: 14 additions & 24 deletions dev/run_code_generator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
source "${CUR_DIR}/go_build_config.sh"

# Possible options for code generator location
GOPATH="${GOPATH:-$(go env GOPATH)}"
CODE_GENERATOR_DIR_INSIDE_MODULES="${SRC_ROOT}/vendor/k8s.io/code-generator"
CODE_GENERATOR_DIR_INSIDE_GOPATH="${GOPATH}/src/k8s.io/code-generator"

Expand All @@ -35,31 +36,20 @@ else
echo "CUSTOM dir ${CODE_GENERATOR_DIR} is used to run code generator from"
fi

echo "Prepare local tmp folder for generator"
mkdir -p "${GENERATOR_ROOT}"
source "${CODE_GENERATOR_DIR}/kube_codegen.sh"

echo ""
echo "Generate code for clickhouse.altinity.com:v1 into ${GENERATOR_ROOT}"
bash "${CODE_GENERATOR_DIR}/generate-groups.sh" \
client,deepcopy,informer,lister \
"${REPO}/pkg/client" \
"${REPO}/pkg/apis" \
"clickhouse.altinity.com:v1" \
-o "${GENERATOR_ROOT}" \
--go-header-file "${SRC_ROOT}/hack/boilerplate.go.txt"
echo "Generate deepcopy helpers for pkg/apis"
kube::codegen::gen_helpers \
--boilerplate "${SRC_ROOT}/hack/boilerplate.go.txt" \
"${SRC_ROOT}/pkg/apis"

echo ""
echo "Generate code for clickhouse-keeper.altinity.com:v1 into ${GENERATOR_ROOT}"
bash "${CODE_GENERATOR_DIR}/generate-groups.sh" \
deepcopy \
"${REPO}/pkg/client" \
"${REPO}/pkg/apis" \
"clickhouse-keeper.altinity.com:v1" \
-o "${GENERATOR_ROOT}" \
--go-header-file "${SRC_ROOT}/hack/boilerplate.go.txt"

echo "Copy generated sources into: ${PKG_ROOT}"
cp -r "${GENERATOR_ROOT}/${REPO}/pkg/"* "${PKG_ROOT}"

echo "Cleanup local tmp folder"
rm -rf "${GENERATOR_ROOT}"
echo "Generate client code for clickhouse.altinity.com into ${SRC_ROOT}/pkg/client"
kube::codegen::gen_client \
--with-watch \
--one-input-api "clickhouse.altinity.com" \
--output-dir "${SRC_ROOT}/pkg/client" \
--output-pkg "${REPO}/pkg/client" \
--boilerplate "${SRC_ROOT}/hack/boilerplate.go.txt" \
"${SRC_ROOT}/pkg/apis"
33 changes: 16 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ replace (
require github.com/altinity/queue v0.0.0-20210114142043-ddb7da66064f

require (
k8s.io/api v0.29.14
k8s.io/apiextensions-apiserver v0.29.14
k8s.io/apimachinery v0.29.14
k8s.io/client-go v0.29.14
k8s.io/code-generator v0.29.14
k8s.io/api v0.30.14
k8s.io/apiextensions-apiserver v0.30.14
k8s.io/apimachinery v0.30.14
k8s.io/client-go v0.30.14
k8s.io/code-generator v0.30.14
)

require (
github.com/MakeNowJust/heredoc v1.0.0
github.com/Masterminds/semver/v3 v3.2.0
github.com/go-logr/logr v1.4.3
github.com/go-zookeeper/zk v1.0.3
github.com/golang/glog v1.0.0
github.com/golang/glog v1.1.0
github.com/google/uuid v1.6.0
github.com/imdario/mergo v0.3.15
github.com/juliangruber/go-intersect v1.0.0
Expand All @@ -43,7 +43,7 @@ require (
golang.org/x/sync v0.19.0
gopkg.in/d4l3k/messagediff.v1 v1.2.1
gopkg.in/yaml.v3 v3.0.1
sigs.k8s.io/controller-runtime v0.15.1
sigs.k8s.io/controller-runtime v0.18.7
)

require (
Expand All @@ -54,10 +54,10 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
Expand Down Expand Up @@ -86,9 +86,8 @@ require (
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
go.uber.org/zap v1.26.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.48.0 // indirect
Expand All @@ -98,16 +97,16 @@ require (
golang.org/x/text v0.32.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.39.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.29.14 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading
0