Skip to content
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.

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

Use kcp-dev/code-generator for informers/listers #88

Draft
wants to merge 4 commits into
base: feature-logical-clusters-1.24
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
70 changes: 70 additions & 0 deletions hack/update-kcp-codegen-orig.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#!/bin/bash

set -e

code-generator informer,lister \
--go-header-file hack/boilerplate/boilerplate.generatego.txt \
--clientset-api-path k8s.io/client-go/kubernetes \
--listers-package k8s.io/client-go/listers \
--informers-package k8s.io/client-go/informers \
--informers-internal-interfaces-package k8s.io/client-go/informers/internalinterfaces \
--input-dir staging/src/k8s.io/api \
--output-dir staging/src/k8s.io/client-go/kcp \
--group-versions storage:v1beta1 \
--group-versions scheduling:v1alpha1 \
--group-versions apiserverinternal:v1alpha1 \
--group-versions core:v1 \
--group-versions admission:v1 \
--group-versions admission:v1beta1 \
--group-versions admissionregistration:v1 \
--group-versions admissionregistration:v1beta1 \
--group-versions apps:v1 \
--group-versions apps:v1beta1 \
--group-versions apps:v1beta2 \
--group-versions authentication:v1 \
--group-versions authentication:v1beta1 \
--group-versions authorization:v1 \
--group-versions authorization:v1beta1 \
--group-versions autoscaling:v1 \
--group-versions autoscaling:v2 \
--group-versions autoscaling:v2beta1 \
--group-versions autoscaling:v2beta2 \
--group-versions batch:v1 \
--group-versions batch:v1beta1 \
--group-versions certificates:v1 \
--group-versions certificates:v1beta1 \
--group-versions coordination:v1beta1 \
--group-versions coordination:v1 \
--group-versions discovery:v1 \
--group-versions discovery:v1beta1 \
--group-versions extensions:v1beta1 \
--group-versions events:v1 \
--group-versions events:v1beta1 \
--group-versions imagepolicy:v1alpha1 \
--group-versions networking:v1 \
--group-versions networking:v1beta1 \
--group-versions node:v1 \
--group-versions node:v1alpha1 \
--group-versions node:v1beta1 \
--group-versions policy:v1 \
--group-versions policy:v1beta1 \
--group-versions rbac:v1 \
--group-versions rbac:v1beta1 \
--group-versions rbac:v1alpha1 \
--group-versions scheduling:v1beta1 \
--group-versions scheduling:v1 \
--group-versions scheduling:v1alpha1 \
--group-versions storage:v1 \
--group-versions flowcontrol:v1alpha1 \
--group-versions flowcontrol:v1beta1 \
--group-versions flowcontrol:v1beta2

code-generator informer,lister \
--go-header-file hack/boilerplate/boilerplate.generatego.txt \
--clientset-api-path k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset \
--listers-package k8s.io/apiextensions-apiserver/pkg/client/listers \
--informers-package k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions \
--informers-internal-interfaces-package k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces \
--input-dir staging/src/k8s.io/apiextensions-apiserver/pkg/apis \
--output-dir staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp \
--group-versions "apiextensions:v1beta1,v1"
53 changes: 53 additions & 0 deletions hack/update-kcp-codegen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#!/usr/bin/env bash

# set -o errexit
# set -o nounset
# set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"

# kube::golang::setup_env

# go install github.com/kcp-dev/code-generator
kcpcodegen=$(kube::util::find-binary "code-generator")

IFS=" " read -r -a GROUP_VERSIONS <<< "${KUBE_AVAILABLE_GROUP_VERSIONS}"
GV_DIRS=()
for gv in "${GROUP_VERSIONS[@]}"; do
# add items, but strip off any leading apis/ you find to match command expectations
api_dir=$(kube::util::group-version-to-pkg-path "${gv}")
nopkg_dir=${api_dir#pkg/}
nopkg_dir=${nopkg_dir#vendor/k8s.io/api/}
pkg_dir=${nopkg_dir#apis/}


# skip groups that aren't being served, clients for these don't matter
if [[ " ${KUBE_NONSERVER_GROUP_VERSIONS} " == *" ${gv} "* ]]; then
continue
fi

GV_DIRS+=("${pkg_dir}")
done
# delimit by commas for the command
GVS=$(echo "${GV_DIRS[*]// /,}" | sed 's|/|:|g' )

set +e
${kcpcodegen} informer,lister \
--output-dir staging/src/k8s.io/client-go/kcp \
--clientset-api-path k8s.io/client-go/kubernetes \
--listers-package k8s.io/client-go/listers \
--informers-package k8s.io/client-go/informers \
--informers-internal-interfaces-package k8s.io/client-go/informers/internalinterfaces \
--input-dir staging/src/k8s.io/api \
--go-header-file "${KUBE_ROOT}/hack/boilerplate/boilerplate.generatego.txt" \
--group-versions $(echo ${GVS} | sed 's/ / --group-versions /g')

${kcpcodegen} informer,lister \
--output-dir staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp \
--clientset-api-path k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset \
--listers-package k8s.io/apiextensions-apiserver/pkg/client/listers \
--informers-package k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions \
--input-dir staging/src/k8s.io/apiextensions-apiserver/pkg/apis \
--go-header-file "${KUBE_ROOT}/hack/boilerplate/boilerplate.generatego.txt" \
--group-versions "apiextensions:v1beta1,v1"

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

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

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

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

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

4 changes: 3 additions & 1 deletion staging/src/k8s.io/client-go/go.mod
Original file line number Diff line number Diff line change
@@ -24,11 +24,13 @@ require (
github.com/google/uuid v1.1.2
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
github.com/imdario/mergo v0.3.5
github.com/kcp-dev/apimachinery v0.0.0-20220805180221-5b13097793e1 // indirect
github.com/kcp-dev/logicalcluster v1.1.1 // indirect
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.7.1
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
5 changes: 5 additions & 0 deletions staging/src/k8s.io/client-go/go.sum

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

21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1/daemonset.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1/deployment.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1/replicaset.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1/statefulset.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1beta1/deployment.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1beta1/statefulset.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1beta2/daemonset.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1beta2/deployment.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1beta2/replicaset.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/apps/v1beta2/statefulset.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/batch/v1/cronjob.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/batch/v1/job.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/batch/v1beta1/cronjob.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/coordination/v1/lease.go
21 changes: 4 additions & 17 deletions staging/src/k8s.io/client-go/informers/core/v1/componentstatus.go
Loading