diff --git a/.drone.yml b/.drone.yml index 6ce79abd..c16009fb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,8 +11,6 @@ steps: image: rancher/dapper:v0.6.0 environment: CROSS: 'true' - GITHUB_TOKEN: - from_secret: github_token commands: - dapper ci - echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags diff --git a/Dockerfile.dapper b/Dockerfile.dapper index d5bd6a2d..018aefe4 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=rancher/hardened-build-base:v1.20.7b2 +ARG GOLANG=rancher/hardened-build-base:v1.22.2b1 FROM ${GOLANG} ARG DAPPER_HOST_ARCH diff --git a/hack/becausewecan.jpg b/hack/becausewecan.jpg deleted file mode 100644 index a09201a0..00000000 Binary files a/hack/becausewecan.jpg and /dev/null differ diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 5d8560dd..c48ea21c 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -10,12 +10,10 @@ git clone --depth 1 ${CODEGEN_GIT_PKG} || true SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. CODEGEN_PKG=./code-generator -"${CODEGEN_PKG}/kube_codegen.sh" \ - "deepcopy" \ - github.com/rancher/k3k/pkg/generated \ - github.com/rancher/k3k/pkg/apis \ - "k3k.io:v1alpha1" \ - --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \ - --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." +source ${CODEGEN_PKG}/kube_codegen.sh + +kube::codegen::gen_helpers \ + --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \ + "${SCRIPT_ROOT}/pkg/apis" rm -rf code-generator