Skip to content
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

Jump to bottom

Kubernetes v0.19.0 #167

Merged
merged 2 commits into from
Aug 12, 2020
Merged

Kubernetes v0.19.0 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e65aef
bump(*) to Kubernetes v0.19.0-rc.3
otaviof Aug 7, 2020
fc3def5
refactor(klog,docker) to adjust to newer version
otaviof Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion cmd/glogflags.go
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/spf13/pflag"

"k8s.io/klog"
"k8s.io/klog/v2"
)

// GLog binds the log flags from the default Google "flag" package into a pflag.FlagSet.
Expand Down
70 changes: 36 additions & 34 deletions go.mod
View file
Open in desktop
Expand Up @@ -12,56 +12,58 @@ require (
github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/fsouza/go-dockerclient v1.6.3
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/opencontainers/runc v1.0.0-rc90
github.com/opencontainers/runtime-spec v1.0.1
github.com/opencontainers/runc v1.0.0-rc91.0.20200707015106-819fcc687efb
github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2
github.com/openshift/api v0.0.0-20200326160804-ecb9283fe820
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
github.com/openshift/imagebuilder v1.1.6
github.com/openshift/library-go v0.0.0-20200327125526-163b2f0d6264
github.com/openshift/source-to-image v1.3.0
github.com/pkg/errors v0.9.1
github.com/seccomp/containers-golang v0.0.0-20190710130535-8d1ed6a872a5 // indirect
github.com/spf13/cobra v0.0.7
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775
k8s.io/api v0.18.0
k8s.io/apimachinery v0.18.0
k8s.io/client-go v0.18.0
k8s.io/component-base v0.18.0
k8s.io/klog v1.0.0
k8s.io/kubectl v0.18.0
k8s.io/kubernetes v1.18.0
github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe // indirect
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
k8s.io/api v0.19.0-rc.3
k8s.io/apimachinery v0.19.0-rc.3
k8s.io/client-go v0.19.0-rc.3
k8s.io/component-base v0.19.0-rc.3
k8s.io/klog/v2 v2.2.0
k8s.io/kubectl v0.19.0-rc.3
k8s.io/kubernetes v1.19.0-rc.3
)

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.3.2
github.com/docker/docker => github.com/openshift/moby-moby v1.4.2-0.20190308215630-da810a85109d
github.com/docker/libnetwork => github.com/docker/libnetwork v0.8.0-dev.2.0.20171107005402-dcf79f8c7fcb
github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f
// these dependencies are needed for runtime-tools, where "mod tidy" disrupts them
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc90
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this replace necessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm removing this replace block, and running go mod tidy. As you can see it skewed runc and runtime-spec a bit. Should we keep with a replace statement instead?

Copy link
Member Author

@otaviof otaviof Aug 10, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I end up adding the replace statements again, due the following errors:

$ make build
hack/build.sh
# github.com/opencontainers/runtime-tools/generate
vendor/github.com/opencontainers/runtime-tools/generate/config.go:184:13: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:185:11: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:185:18: undefined: specs.VM
vendor/github.com/opencontainers/runtime-tools/generate/config.go:191:14: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:192:11: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:192:28: undefined: specs.VMHypervisor
vendor/github.com/opencontainers/runtime-tools/generate/config.go:198:14: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:199:11: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:199:24: undefined: specs.VMKernel
vendor/github.com/opencontainers/runtime-tools/generate/config.go:205:14: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:205:14: too many errors
make: *** [Makefile:11: build] Error 2

github.com/opencontainers/runtime-tools => github.com/opencontainers/runtime-tools v0.8.0
// Needed to resolve broken transitive dependencies in buildkit and s2i
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
// these are needed since k8s.io/kubernetes cites v0.0.0 for these in its go.mod
k8s.io/api => k8s.io/api v0.18.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
k8s.io/apiserver => k8s.io/apiserver v0.18.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
k8s.io/client-go => k8s.io/client-go v0.18.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
k8s.io/code-generator => k8s.io/code-generator v0.18.0
k8s.io/component-base => k8s.io/component-base v0.18.0
k8s.io/cri-api => k8s.io/cri-api v0.18.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
k8s.io/kubectl => k8s.io/kubectl v0.18.0
k8s.io/kubelet => k8s.io/kubelet v0.18.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
k8s.io/metrics => k8s.io/metrics v0.18.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
k8s.io/api => k8s.io/api v0.19.0-rc.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.3
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.3
k8s.io/apiserver => k8s.io/apiserver v0.19.0-rc.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-rc.3
k8s.io/client-go => k8s.io/client-go v0.19.0-rc.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0-rc.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.3
k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.3
k8s.io/component-base => k8s.io/component-base v0.19.0-rc.3
k8s.io/cri-api => k8s.io/cri-api v0.19.0-rc.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-rc.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0-rc.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.3
k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.3
k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0-rc.3
k8s.io/metrics => k8s.io/metrics v0.19.0-rc.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.3
)