Skip to content

Commit

Permalink
update pvmigrate (#218)
Browse files Browse the repository at this point in the history 
* chore: Bump github.com/replicatedhq/pvmigrate from 0.9.0 to 0.11.2

Bumps [github.com/replicatedhq/pvmigrate](https://github.com/replicatedhq/pvmigrate) from 0.9.0 to 0.11.2.
- [Release notes](https://github.com/replicatedhq/pvmigrate/releases)
- [Commits](replicatedhq/pvmigrate@v0.9.0...v0.11.2)

---
updated-dependencies:
- dependency-name: github.com/replicatedhq/pvmigrate
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* update kubernetes version replacements

* bookworm not buster

* update cert api types

* more types

* bookworm mk 2

* removed packages

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
@laverya @dependabot
laverya and dependabot[bot] authored Jan 12, 2024
1 parent fd66a4b commit 4929ff7
Show file tree
Hide file tree
Showing 10 changed files with 1,366 additions and 239 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/alpha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.21'
- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.21'
- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.21'
- run: make deps test build

build-image:
Expand Down
5 changes: 3 additions & 2 deletions cmd/ekco/cli/regen-cert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
certutil "k8s.io/client-go/util/cert"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/renewal"
"k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil"
Expand Down Expand Up @@ -43,8 +44,8 @@ func RegenCertCmd(v *viper.Viper) *cobra.Command {
AltNames: certutil.AltNames{},
Usages: cert.ExtKeyUsage,
},
NotAfter: &cert.NotAfter,
PublicKeyAlgorithm: cert.PublicKeyAlgorithm,
NotAfter: &cert.NotAfter,
EncryptionAlgorithm: kubeadmapi.EncryptionAlgorithmType(cert.PublicKeyAlgorithm.String()),
}

newCertIPs := map[string]net.IP{}
Expand Down
6 changes: 2 additions & 4 deletions deploy/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-buster AS build
FROM golang:1.21-bookworm AS build

ARG git_sha=unknown
ARG version=alpha
Expand All @@ -20,14 +20,12 @@ RUN helm pull rook-release/rook-ceph-cluster --version $rook_version && mv rook-
RUN make build GIT_SHA=$git_sha VERSION=$version


FROM debian:buster-slim
FROM debian:bookworm-slim

RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get upgrade -qq && apt-get install -y --no-install-recommends \
libgcrypt20 \
libgnutls30 \
libhogweed4 \
liblz4-1 \
libnettle6 \
&& rm -rf /var/lib/apt/lists/*

COPY --from=build /go/src/github.com/replicatedhq/ekco/bin/* /usr/bin/
Expand Down
155 changes: 80 additions & 75 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/replicatedhq/ekco

go 1.20
go 1.21

toolchain go1.21.5

require (
github.com/blang/semver v3.5.1+incompatible
Expand All @@ -12,22 +14,22 @@ require (
github.com/minio/minio-go/v7 v7.0.63
github.com/pkg/errors v0.9.1
github.com/projectcontour/contour v1.25.2
github.com/replicatedhq/pvmigrate v0.9.0
github.com/replicatedhq/pvmigrate v0.11.2
github.com/rook/rook v1.11.9
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.4
github.com/vmware-tanzu/velero v1.11.1
go.etcd.io/etcd/client/v3 v3.5.9
go.etcd.io/etcd/client/v3 v3.5.10
go.uber.org/zap v1.25.0
go.undefinedlabs.com/scopeagent v0.4.2
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.12.3
k8s.io/api v0.27.3
k8s.io/apimachinery v0.27.3
k8s.io/client-go v0.27.3
k8s.io/kubernetes v1.27.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
k8s.io/api v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/client-go v0.29.0
k8s.io/kubernetes v1.29.0
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/yaml v1.3.0
)

Expand Down Expand Up @@ -68,19 +70,19 @@ require (
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand All @@ -95,12 +97,13 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -145,7 +148,7 @@ require (
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/locker v1.0.1 // indirect
Expand All @@ -156,6 +159,7 @@ require (
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
github.com/openshift/api v0.0.0-20210105115604-44119421ec6b // indirect
Expand All @@ -166,10 +170,10 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.61.1 // indirect
github.com/prometheus-operator/prometheus-operator/pkg/client v0.61.1 // indirect
github.com/prometheus/client_golang v1.15.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.43.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/rs/xid v1.5.0 // indirect
github.com/rubenv/sql-migrate v1.3.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand All @@ -188,14 +192,14 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.starlark.net v0.0.0-20201006213952-227f4aabceb5 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
Expand All @@ -208,9 +212,9 @@ require (
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -219,59 +223,60 @@ require (
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.27.3 // indirect
k8s.io/apiserver v0.27.3 // indirect
k8s.io/cli-runtime v0.27.3 // indirect
k8s.io/cloud-provider v0.27.1 // indirect
k8s.io/cluster-bootstrap v0.27.1 // indirect
k8s.io/component-base v0.27.3 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/apiserver v0.29.0 // indirect
k8s.io/cli-runtime v0.29.0 // indirect
k8s.io/cloud-provider v0.29.0 // indirect
k8s.io/cluster-bootstrap v0.29.0 // indirect
k8s.io/component-base v0.29.0 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubectl v0.27.3 // indirect
oras.land/oras-go v1.2.3 // indirect
sigs.k8s.io/controller-runtime v0.14.6 // indirect
sigs.k8s.io/controller-runtime v0.16.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/mcs-api v0.1.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

// TODO: when controller-runtime past v0.14.6 is released, remove this line
replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.13.1-0.20230418125457-f83169592e24

replace (
// to include k8s.io/kubernetes v1.27.1
k8s.io/api => k8s.io/api v0.27.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.1
k8s.io/apimachinery => k8s.io/apimachinery v0.27.1
k8s.io/apiserver => k8s.io/apiserver v0.27.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.1
k8s.io/client-go => k8s.io/client-go v0.27.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.1
k8s.io/code-generator => k8s.io/code-generator v0.27.1
k8s.io/component-base => k8s.io/component-base v0.27.1
k8s.io/component-helpers => k8s.io/component-helpers v0.27.1
k8s.io/controller-manager => k8s.io/controller-manager v0.27.1
k8s.io/cri-api => k8s.io/cri-api v0.27.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.1
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.1
k8s.io/kms => k8s.io/kms v0.27.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.1
k8s.io/kubectl => k8s.io/kubectl v0.27.1
k8s.io/kubelet => k8s.io/kubelet v0.27.1
k8s.io/kubernetes => k8s.io/kubernetes v1.27.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.1
k8s.io/metrics => k8s.io/metrics v0.27.1
k8s.io/mount-utils => k8s.io/mount-utils v0.27.1
k8s.io/node-api => k8s.io/node-api v0.27.1
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.1
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.1
k8s.io/sample-controller => k8s.io/sample-controller v0.27.1
// to include k8s.io/kubernetes v1.29.0
k8s.io/api => k8s.io/api v0.29.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
k8s.io/apiserver => k8s.io/apiserver v0.29.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
k8s.io/client-go => k8s.io/client-go v0.29.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
k8s.io/code-generator => k8s.io/code-generator v0.29.0
k8s.io/component-base => k8s.io/component-base v0.29.0
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
k8s.io/cri-api => k8s.io/cri-api v0.29.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0
k8s.io/kms => k8s.io/kms v0.29.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
k8s.io/kubectl => k8s.io/kubectl v0.29.0
k8s.io/kubelet => k8s.io/kubelet v0.29.0
k8s.io/kubernetes => k8s.io/kubernetes v1.29.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
k8s.io/metrics => k8s.io/metrics v0.29.0
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
k8s.io/node-api => k8s.io/node-api v0.29.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.0
k8s.io/sample-controller => k8s.io/sample-controller v0.29.0
)

// from https://github.com/rook/rook/blob/v1.11.5/go.mod
Expand All @@ -291,21 +296,21 @@ exclude (
k8s.io/client-go v1.5.0
k8s.io/client-go v1.5.1
k8s.io/client-go v1.5.2
k8s.io/client-go v10.0.0+incompatible
k8s.io/client-go v11.0.0+incompatible
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/client-go v12.0.0+incompatible
k8s.io/client-go v2.0.0+incompatible
k8s.io/client-go v2.0.0-alpha.1+incompatible
k8s.io/client-go v3.0.0+incompatible
k8s.io/client-go v2.0.0+incompatible
k8s.io/client-go v3.0.0-beta.0+incompatible
k8s.io/client-go v4.0.0+incompatible
k8s.io/client-go v3.0.0+incompatible
k8s.io/client-go v4.0.0-beta.0+incompatible
k8s.io/client-go v4.0.0+incompatible
k8s.io/client-go v5.0.0+incompatible
k8s.io/client-go v5.0.1+incompatible
k8s.io/client-go v6.0.0+incompatible
k8s.io/client-go v7.0.0+incompatible
k8s.io/client-go v8.0.0+incompatible
k8s.io/client-go v9.0.0+incompatible
k8s.io/client-go v9.0.0-invalid+incompatible
k8s.io/client-go v9.0.0+incompatible
k8s.io/client-go v10.0.0+incompatible
k8s.io/client-go v11.0.0+incompatible
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/client-go v12.0.0+incompatible
)
Loading

0 comments on commit 4929ff7

Please sign in to comment.