Skip to content

OCPBUGS-38654: [release-4.17] Verify that the codegen changes were commited #2475

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
openshift-merge-bot merged 4 commits into from
Aug 21, 2024
Merged

OCPBUGS-38654: [release-4.17] Verify that the codegen changes were commited #2475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
992e494
Add controller-gen as a dependency
kyrtapz Aug 9, 2024
fc871ba
Simplify hack/update-codegen.sh
kyrtapz May 17, 2024
224012c
Add a way to verify the codegen changes to the Makefile
kyrtapz May 17, 2024
db44aad
Run codegen
kyrtapz Aug 9, 2024
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
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,16 @@ install.tools:
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b ${GOPATH}/bin
.PHONY: install.tools

.PHONY: update-codegen
update-codegen:
hack/update-codegen.sh

.PHONY: verify-update-codegen
verify-update-codegen: update-codegen
git diff --exit-code

.PHONY: verify
verify: verify-update-codegen

clean:
$(RM) cluster-network-operator cluster-network-check-endpoints cluster-network-check-target
Expand Down
26 changes: 15 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ require (
github.com/containernetworking/cni v0.8.0
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/onsi/gomega v1.32.0
github.com/onsi/gomega v1.33.0
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
github.com/spf13/cobra v1.7.0
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
github.com/stretchr/testify v1.8.4
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
golang.org/x/net v0.23.0
golang.org/x/net v0.24.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
Expand Down Expand Up @@ -85,15 +85,15 @@ require (
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.18.0 // indirect
golang.org/x/tools v0.20.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
Expand All @@ -107,7 +107,7 @@ require (
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // 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
)

require (
Expand All @@ -117,6 +117,7 @@ require (
github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc
k8s.io/apiextensions-apiserver v0.30.2
k8s.io/client-go v0.30.2
sigs.k8s.io/controller-tools v0.15.0
)

require (
Expand All @@ -136,12 +137,15 @@ require (
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gobuffalo/flect v1.0.2 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
Expand Down
87 changes: 34 additions & 53 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 13 additions & 41 deletions hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,6 @@ set -o pipefail

SCRIPT_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."

get_latest_release() {
curl --silent "https://api.github.com/repos/kubernetes-sigs/controller-tools/releases/latest" |
grep '"tag_name":' |
sed -E 's/.*"([^"]+)".*/\1/'
}

# Get latest tagged release of controller-gen
LATEST_CONTROLLER_GEN_VER=$(get_latest_release)

if ( ! ( command -v controller-gen > /dev/null ) || test "$(controller-gen --version)" != "Version: ${LATEST_CONTROLLER_GEN_VER}" ); then
echo "controller-gen not found or out-of-date, installing latest version sigs.k8s.io/controller-tools@${LATEST_CONTROLLER_GEN_VER}"
olddir="${PWD}"
builddir="$(mktemp -d)"
cd "${builddir}"
GO111MODULE=on go install sigs.k8s.io/controller-tools/cmd/controller-gen@${LATEST_CONTROLLER_GEN_VER}
cd "${olddir}"
if [[ "${builddir}" == /tmp/* ]]; then #paranoia
rm -rf "${builddir}"
fi
fi

bash "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/kube_codegen.sh" deepcopy \
github.com/openshift/openshift-network-operator/pkg/generated github.com/openshift/cluster-network-operator/pkg/apis \
"network:v1" \
Expand All @@ -35,34 +14,27 @@ bash "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/kube_codegen.sh" deepcopy \

echo "Generating CRDs"
mkdir -p _output/crds
controller-gen crd paths=./pkg/apis/... output:crd:dir=_output/crds
GO111MODULE=on GOFLAGS=-mod=vendor go build -tags=tools -o _output/bin/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
_output/bin/controller-gen crd paths=./pkg/apis/... output:crd:dir=_output/crds

# ensure our CRD is installed by setting a "release profile"
RELEASE_PROFILE="include.release.openshift.io/self-managed-high-availability=true"
ROKS_PROFILE="include.release.openshift.io/ibm-cloud-managed=true"
SINGLE_NODE_DEV_PROFILE="include.release.openshift.io/single-node-developer=true"
HEADER="# This file is automatically generated. DO NOT EDIT"

# Add a new CRD? Duplicate these lines
## Add a new CRD? Duplicate these lines
echo "${HEADER}" > manifests/0000_70_cluster-network-operator_01_pki_crd.yaml
oc annotate --local -o yaml \
"${RELEASE_PROFILE}" \
"${ROKS_PROFILE}" \
"${SINGLE_NODE_DEV_PROFILE}" \
-f _output/crds/network.operator.openshift.io_operatorpkis.yaml >> manifests/0000_70_cluster-network-operator_01_pki_crd.yaml
cat _output/crds/network.operator.openshift.io_operatorpkis.yaml >> manifests/0000_70_cluster-network-operator_01_pki_crd.yaml

# and also the CRD from library-go
oc annotate --local -o yaml --overwrite \
"${RELEASE_PROFILE}" \
"${ROKS_PROFILE}" \
-f vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks.crd.yaml > manifests/0000_70_network_01_networks.crd.yaml
rm -f "manifests/0000_70_network_01_networks"*.yaml
for file in "vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks"*.yaml; do
# Extract the filename from the path
filename=$(basename "${file}")

echo "${HEADER}" > "manifests/${filename}"
cat "${file}" >> "manifests/${filename}"
done

echo "${HEADER}" > manifests/0000_70_cluster-network-operator_01_egr_crd.yaml
oc annotate --local -o yaml --overwrite \
"${RELEASE_PROFILE}" \
"${ROKS_PROFILE}" \
"${SINGLE_NODE_DEV_PROFILE}" \
-f vendor/github.com/openshift/api/networkoperator/v1/zz_generated.crd-manifests/001_egressrouters.crd.yaml >> manifests/0000_70_cluster-network-operator_01_egr_crd.yaml
cat vendor/github.com/openshift/api/networkoperator/v1/zz_generated.crd-manifests/001_egressrouters.crd.yaml >> manifests/0000_70_cluster-network-operator_01_egr_crd.yaml

echo "${HEADER}" > bindata/cloud-network-config-controller/common/001-crd.yaml
cat vendor/github.com/openshift/api/cloudnetwork/v1/zz_generated.crd-manifests/001_cloudprivateipconfigs.crd.yaml >> bindata/cloud-network-config-controller/common/001-crd.yaml
1 change: 0 additions & 1 deletion manifests/0000_70_cluster-network-operator_01_egr_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ metadata:
api.openshift.io/merged-by-featuregates: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: egressrouters.network.operator.openshift.io
spec:
group: network.operator.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion manifests/0000_70_cluster-network-operator_01_pki_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# This file is automatically generated. DO NOT EDIT
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: operatorpkis.network.operator.openshift.io
spec:
group: network.operator.openshift.io
Expand Down
Loading