Skip to content

Commit

Permalink
UPSTREAM: <drop>: run make update
Browse files Browse the repository at this point in the history
make update fails with the following error due to some go mod issue
in code-generator:
```
inconsistent vendoring in /go/{redacted}/k8s.io/code-generator
```

to work around, we do the following:

- change directory to 'staging/src/k8s.io/code-generator'
- remove the following from the 'replace' section
	 k8s.io/code-generator => ../code-generator
- run 'go mod tidy'
- run 'go mod vendor'

- change directory to root
- run make update, using the following command

podman run -it --rm -v $( pwd ):/go/src/k8s.io/kubernetes:Z \
  --workdir=/go/src/k8s.io/kubernetes \
  registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.18-openshift-4.11 \
  make update OS_RUN_WITHOUT_DOCKER=yes

inside the docker prompt, also run the followig:
- OS_RUN_WITHOUT_DOCKER=yes hack/update-generated-pod-resources.sh
  • Loading branch information
tkashem committed May 26, 2022
1 parent 3af2f68 commit a9ff876
Show file tree
Hide file tree
Showing 32 changed files with 4,498 additions and 2,849 deletions.
4,122 changes: 2,580 additions & 1,542 deletions openshift-hack/e2e/annotate/generated/zz_generated.annotations.go

Large diffs are not rendered by default.

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.

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.

0 comments on commit a9ff876

Please sign in to comment.