Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
K8s 1.25 (#1717)
Browse files Browse the repository at this point in the history 
* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* Kubernetes 1.25 support.

* bump k8scc

* bump k8scc
  • Loading branch information
@whites11
whites11 authored May 16, 2023
1 parent 6460aac commit e2318c7
Show file tree
Hide file tree
Showing 22 changed files with 207 additions and 240 deletions.
1 change: 1 addition & 0 deletions .nancy-ignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ CVE-2020-8561
CVE-2023-28642
CVE-2023-27561
CVE-2023-25809
CVE-2023-29401
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Remove logic that migrates CAPI CRDs from experimental group to new group.

### Changed

- Kubernetes 1.25 support.

## [7.2.0] - 2023-03-07

### Changed
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
FROM quay.io/giantswarm/golang:1.17.7 AS builder
FROM quay.io/giantswarm/golang:1.20.3 AS builder
ENV GO111MODULE=on
COPY go.mod /etc/go.mod
RUN cat /etc/go.mod | grep k8scloudconfig | awk '{print $1"/...@"$2}' | xargs -I{} go get {}
# This is needed to extract the versioned catalog name, e.g. v6@6.0.1
RUN ln -s /go/pkg/mod/$(cat /etc/go.mod | grep k8scloudconfig | awk '{print $1"@"$2}') /opt/k8scloudconfig
RUN git clone --depth 1 --branch $(cat /etc/go.mod | grep k8scloudconfig | awk '{print $2}') https://github.com/giantswarm/k8scloudconfig.git && cp -r k8scloudconfig /opt/k8scloudconfig

FROM alpine:3.16.2
FROM alpine:3.17.3

RUN apk add --update ca-certificates \
&& rm -rf /var/cache/apk/*
Expand Down
80 changes: 44 additions & 36 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,38 @@ require (
github.com/giantswarm/exporterkit v1.0.0
github.com/giantswarm/ipam v0.3.0
github.com/giantswarm/k8sclient/v7 v7.0.1
github.com/giantswarm/k8scloudconfig/v15 v15.7.0
github.com/giantswarm/k8smetadata v0.9.3
github.com/giantswarm/k8scloudconfig/v17 v17.0.0
github.com/giantswarm/k8smetadata v0.19.0
github.com/giantswarm/kubelock/v2 v2.0.0
github.com/giantswarm/microendpoint v1.0.0
github.com/giantswarm/microerror v0.4.0
github.com/giantswarm/microkit v1.0.0
github.com/giantswarm/micrologger v0.6.0
github.com/giantswarm/micrologger v1.0.0
github.com/giantswarm/operatorkit/v7 v7.0.1
github.com/giantswarm/release-operator/v3 v3.2.0
github.com/giantswarm/release-operator/v4 v4.0.0
github.com/giantswarm/tenantcluster/v6 v6.0.0
github.com/giantswarm/to v0.4.0
github.com/giantswarm/versionbundle v1.0.0
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.8
github.com/google/go-cmp v0.5.9
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v1.13.0
github.com/spf13/viper v1.12.0
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
k8s.io/api v0.22.5
k8s.io/apiextensions-apiserver v0.22.2
k8s.io/apimachinery v0.22.5
k8s.io/client-go v0.22.5
github.com/prometheus/client_golang v1.14.0
github.com/spf13/viper v1.14.0
golang.org/x/sync v0.1.0
k8s.io/api v0.24.3
k8s.io/apiextensions-apiserver v0.24.3
k8s.io/apimachinery v0.24.3
k8s.io/client-go v0.24.3
sigs.k8s.io/cluster-api v1.0.5
sigs.k8s.io/cluster-api-provider-azure v1.0.2
sigs.k8s.io/controller-runtime v0.10.3
sigs.k8s.io/controller-runtime v0.12.3
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
Expand All @@ -63,72 +63,80 @@ require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.12.0 // indirect
github.com/giantswarm/backoff v1.0.0 // indirect
github.com/giantswarm/microstorage v0.2.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/gobuffalo/flect v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/onsi/gomega v1.17.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/gomega v1.19.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.3.0 // indirect
github.com/spf13/cobra v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
go.opentelemetry.io/otel v1.3.0 // indirect
go.opentelemetry.io/otel/trace v1.3.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/resty.v1 v1.12.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.22.5 // indirect
k8s.io/component-base v0.22.5 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
k8s.io/apiserver v0.24.3 // indirect
k8s.io/component-base v0.24.3 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
)

Expand All @@ -140,6 +148,7 @@ replace (
github.com/coreos/etcd v3.3.13+incompatible => github.com/coreos/etcd v3.3.27+incompatible
github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
github.com/giantswarm/micrologger => github.com/giantswarm/micrologger v0.6.0
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
github.com/go-ldap/ldap/v3 => github.com/go-ldap/ldap/v3 v3.4.4
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
Expand All @@ -155,7 +164,6 @@ replace (
github.com/valyala/fasthttp => github.com/valyala/fasthttp v1.39.0
go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.10.1
k8s.io/klog/v2 => k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.5
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.10.3
)
Loading

0 comments on commit e2318c7

Please sign in to comment.