Skip to content

Bug 1994480: Update dependencies to K8s 1.22 #128

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-ci merged 4 commits into from
Aug 18, 2021
Merged

Bug 1994480: Update dependencies to K8s 1.22 #128

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
dcbdd84
Update dependencies to K8s 1.22
JoelSpeed Aug 17, 2021
e675cf5
Bump golang image in makefile to 1.16
JoelSpeed Aug 17, 2021
2802d5e
Bump ci-operator golang image to 1.16
JoelSpeed Aug 17, 2021
dc23c86
Ensure HOME is set for cache setup
JoelSpeed Aug 17, 2021
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: golang-1.15
tag: golang-1.16
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ifeq ($(NO_DOCKER), 1)
DOCKER_CMD =
IMAGE_BUILD_CMD = imagebuilder
else
DOCKER_CMD := $(ENGINE) run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/cluster-machine-approver:Z -w /go/src/github.com/openshift/cluster-machine-approver openshift/origin-release:golang-1.15
DOCKER_CMD := $(ENGINE) run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/cluster-machine-approver:Z -w /go/src/github.com/openshift/cluster-machine-approver openshift/origin-release:golang-1.16
IMAGE_BUILD_CMD = $(ENGINE) build
endif

Expand Down
31 changes: 17 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
module github.com/openshift/cluster-machine-approver

go 1.15
go 1.16

require (
github.com/onsi/ginkgo v1.15.0
github.com/onsi/gomega v1.10.5
github.com/openshift/api v0.0.0-20210415150416-88a128ebb551
github.com/openshift/client-go v0.0.0-20210409155308-a8e62c60e930
github.com/openshift/cluster-api v0.0.0-20191129101638-b09907ac6668
github.com/openshift/library-go v0.0.0-20210414082648-6e767630a0dc
github.com/prometheus/client_golang v1.9.0
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/klog/v2 v2.8.0
sigs.k8s.io/controller-runtime v0.9.0-beta.1.0.20210512131817-ce2f0c92d77e
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/openshift/api v0.0.0-20210816181336-8ff39b776da3
github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e
github.com/openshift/library-go v0.0.0-20210811133500-5e31383de2a7
github.com/openshift/machine-api-operator v0.2.1-0.20210810163111-abd3c0efdfee
github.com/prometheus/client_golang v1.11.0
k8s.io/api v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/client-go v0.22.0
k8s.io/klog/v2 v2.9.0
sigs.k8s.io/controller-runtime v0.9.3
)

replace k8s.io/client-go => k8s.io/client-go v0.21.0
replace (
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210622023641-c69a3acaee27
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210816141152-a7c40345b994
)
571 changes: 468 additions & 103 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions hack/fetch_ext_bins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,10 @@ function setup_envs {
export TEST_ASSET_KUBECTL=/tmp/kubebuilder/bin/kubectl
export TEST_ASSET_KUBE_APISERVER=/tmp/kubebuilder/bin/kube-apiserver
export TEST_ASSET_ETCD=/tmp/kubebuilder/bin/etcd

# Ensure that some home var is set and that it's not the root
export HOME=${HOME:=/tmp/kubebuilder-testing}
if [ $HOME == "/" ]; then
export HOME=/tmp/kubebuilder-testing
fi
}
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"time"

configv1 "github.com/openshift/api/config/v1"
machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
"github.com/openshift/cluster-machine-approver/pkg/controller"
"github.com/openshift/cluster-machine-approver/pkg/metrics"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
corev1 "k8s.io/api/core/v1"
control "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"sync/atomic"

machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
certificatesv1 "k8s.io/api/certificates/v1"
certificatesv1client "k8s.io/client-go/kubernetes/typed/certificates/v1"

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/csr_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"strings"
"time"

machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
certificatesv1 "k8s.io/api/certificates/v1"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/csr_check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
)

/*
Expand Down
19 changes: 0 additions & 19 deletions vendor/github.com/evanphx/json-patch/.travis.yml
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions vendor/github.com/evanphx/json-patch/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 18 additions & 15 deletions vendor/github.com/evanphx/json-patch/merge.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/evanphx/json-patch/patch.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 2 additions & 8 deletions vendor/github.com/golang/protobuf/proto/registry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/golang/protobuf/ptypes/any.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/golang/protobuf/ptypes/doc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/golang/protobuf/ptypes/duration.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading