diff --git a/Dockerfile b/Dockerfile index 679c55de..eb267193 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020 the Pinniped contributors. All Rights Reserved. +# Copyright 2020-2021 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 FROM golang:1.15.6 as build-env @@ -6,8 +6,8 @@ FROM golang:1.15.6 as build-env WORKDIR /work # Get dependencies first so they can be cached as a layer COPY go.* ./ -COPY generated/1.19/apis/go.* ./generated/1.19/apis/ -COPY generated/1.19/client/go.* ./generated/1.19/client/ +COPY generated/1.20/apis/go.* ./generated/1.20/apis/ +COPY generated/1.20/client/go.* ./generated/1.20/client/ RUN go mod download # Copy only the production source code to avoid cache misses when editing other files diff --git a/hack/update.sh b/hack/update.sh index a743d76a..919b520d 100755 --- a/hack/update.sh +++ b/hack/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2020 the Pinniped contributors. All Rights Reserved. +# Copyright 2020-2021 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 set -euo pipefail @@ -11,8 +11,8 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" xargs -n 1 -P 8 "$ROOT/hack/lib/update-codegen.sh" < "${ROOT}/hack/lib/kube-versions.txt" # Copy each CRD yaml to the app which should cause it to be installed. -cp "$ROOT"/generated/1.19/crds/*.supervisor.*.yaml "$ROOT/deploy/supervisor" -cp "$ROOT"/generated/1.19/crds/*.concierge.*.yaml "$ROOT/deploy/concierge" +cp "$ROOT"/generated/1.20/crds/*.supervisor.*.yaml "$ROOT/deploy/supervisor" +cp "$ROOT"/generated/1.20/crds/*.concierge.*.yaml "$ROOT/deploy/concierge" # Tidy. "$ROOT/hack/module.sh" tidy