Skip to content

Oc 4.7 kubernetes 1.20.0 beta.2 #660

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-robot merged 14 commits into from
Dec 4, 2020
Merged

Oc 4.7 kubernetes 1.20.0 beta.2 #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9ff6a38
Pin to 1.20.0-beta.2
ingvagabund Nov 20, 2020
8bf1b91
Pin openshift deps to 1.20.0-beta.2 branches
ingvagabund Nov 20, 2020
b694a9a
Drop legacyscheme and convert command
ingvagabund Nov 20, 2020
d105821
Update k8s.io imports
ingvagabund Nov 20, 2020
9aa2abc
pkg/helpers/describe UserOAuthAccessToken ignore missing describer
ingvagabund Nov 20, 2020
e72b3c3
Replace RoleBindingBuilder with direct RoleBinding construction
soltysh Nov 6, 2020
3982827
Copy credentialprovider from kubernetes
soltysh Nov 6, 2020
8e5aa90
Drop verify-imports
soltysh Nov 6, 2020
c267d09
Set default discovery burst to 200
ingvagabund Nov 20, 2020
c2c3673
go mod tidy && go mod vendor
ingvagabund Nov 20, 2020
421f478
Bump k8s version in Makefile
ingvagabund Nov 20, 2020
24613ec
Run ./hack/update-generated-completions.sh
ingvagabund Nov 20, 2020
7456654
Drop --config from oc project/projects/requestproject
ingvagabund Dec 1, 2020
441ef05
Replace config with kubeconfig
ingvagabund Dec 1, 2020
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
  •  
  •  
  •  
10 changes: 3 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
)

GO_LD_EXTRAFLAGS :=-X k8s.io/component-base/version.gitMajor="1" \
-X k8s.io/component-base/version.gitMinor="19" \
-X k8s.io/component-base/version.gitVersion="v1.19.0" \
-X k8s.io/component-base/version.gitMinor="20" \
-X k8s.io/component-base/version.gitVersion="v1.20.0-beta.2-6-g99ac8bc" \
-X k8s.io/component-base/version.gitCommit="$(SOURCE_GIT_COMMIT)" \
-X k8s.io/component-base/version.buildDate="$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-X k8s.io/component-base/version.gitTreeState="clean" \
Expand Down Expand Up @@ -69,7 +69,7 @@ oc: build
update: update-generated-completions
.PHONY: update

verify: verify-cli-conventions verify-generated-completions verify-imports
verify: verify-cli-conventions verify-generated-completions
.PHONY: verify

verify-cli-conventions:
Expand All @@ -84,10 +84,6 @@ verify-generated-completions: build
hack/verify-generated-completions.sh
.PHONY: verify-generated-completions

verify-imports:
hack/verify-imports.sh
.PHONY: verify-imports

generate-versioninfo:
SOURCE_GIT_TAG=$(SOURCE_GIT_TAG) hack/generate-versioninfo.sh
.PHONY: generate-versioninfo
Expand Down
17 changes: 0 additions & 17 deletions cmd/oc/oc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"k8s.io/component-base/logs"
"k8s.io/klog/v2"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/api/legacyscheme"

"github.com/openshift/api/apps"
"github.com/openshift/api/authorization"
Expand Down Expand Up @@ -89,22 +88,6 @@ func main() {
utilruntime.Must(user.Install(scheme.Scheme))
legacy.InstallExternalLegacyAll(scheme.Scheme)

// the legacyscheme is used in kubectl convert and get, so we need to
// explicitly install all types there too
utilruntime.Must(apps.Install(legacyscheme.Scheme))
utilruntime.Must(authorization.Install(legacyscheme.Scheme))
utilruntime.Must(build.Install(legacyscheme.Scheme))
utilruntime.Must(image.Install(legacyscheme.Scheme))
utilruntime.Must(network.Install(legacyscheme.Scheme))
utilruntime.Must(oauth.Install(legacyscheme.Scheme))
utilruntime.Must(project.Install(legacyscheme.Scheme))
utilruntime.Must(installNonCRDQuota(legacyscheme.Scheme))
utilruntime.Must(route.Install(legacyscheme.Scheme))
utilruntime.Must(installNonCRDSecurity(legacyscheme.Scheme))
utilruntime.Must(template.Install(legacyscheme.Scheme))
utilruntime.Must(user.Install(legacyscheme.Scheme))
legacy.InstallExternalLegacyAll(legacyscheme.Scheme)

basename := filepath.Base(os.Args[0])
command := cli.CommandFor(basename)
if err := command.Execute(); err != nil {
Expand Down
Loading