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

Commit

Permalink
Release v7.2.0 (#653)
Browse files Browse the repository at this point in the history
* Upgrade dependencies

* Release v7.2.0

* fix cves

* fix tests

Signed-off-by: QuentinBisson <quentin@giantswarm.io>

---------

Signed-off-by: QuentinBisson <quentin@giantswarm.io>
Co-authored-by: QuentinBisson <quentin@giantswarm.io>
  • Loading branch information
taylorbot and QuentinBisson committed Nov 15, 2023
1 parent 1f23c47 commit ac4a5cf
Show file tree
Hide file tree
Showing 12 changed files with 296 additions and 1,310 deletions.
21 changes: 2 additions & 19 deletions .nancy-ignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,2 @@
CVE-2019-10743 until=2023-10-01
CVE-2023-26125 until=2023-10-01
CVE-2023-29401 until=2023-10-01
CVE-2020-36567 until=2023-10-01
CVE-2020-28483 until=2023-10-01
CVE-2022-29153 until=2023-10-01
CVE-2021-41803 until=2023-10-01
CVE-2022-24687 until=2023-10-01
CVE-2022-29153 until=2023-10-01
CVE-2021-41803 until=2023-10-01
CVE-2022-24687 until=2023-10-01
CVE-2021-23772 until=2023-10-01
CVE-2021-42576 until=2023-10-01
CVE-2020-26892 until=2023-10-01
CVE-2021-3127 until=2023-10-01
CVE-2022-21221 until=2023-10-01
CVE-2022-32149 until=2023-10-01
CVE-2020-8561 until=2023-10-01
CVE-2023-32731 until=2023-10-01
# pkg:golang/k8s.io/apiserver@v0.28.3
CVE-2020-8561
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [7.2.0] - 2023-11-09

## [Unreleased]
### Changed

- Upgrade go to 1.21
- Upgrade k8s dependencies to 1.28.x

## [7.1.0] - 2022-07-18

Expand Down Expand Up @@ -213,7 +218,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0



[Unreleased]: https://github.com/giantswarm/operatorkit/compare/v7.1.0...HEAD
[Unreleased]: https://github.com/giantswarm/operatorkit/compare/v7.2.0...HEAD
[7.2.0]: https://github.com/giantswarm/operatorkit/compare/v7.1.0...v7.2.0
[7.1.0]: https://github.com/giantswarm/operatorkit/compare/v7.0.1...v7.1.0
[7.0.1]: https://github.com/giantswarm/operatorkit/compare/v7.0.0...v7.0.1
[7.0.0]: https://github.com/giantswarm/operatorkit/compare/v6.1.0...v7.0.0
Expand Down
1 change: 0 additions & 1 deletion api/v1/zz_generated.deepcopy.go

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

9 changes: 1 addition & 8 deletions config/crd/testing.giantswarm.io_examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: examples.testing.giantswarm.io
spec:
group: testing.giantswarm.io
Expand Down Expand Up @@ -81,9 +80,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
117 changes: 58 additions & 59 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,84 +1,83 @@
module github.com/giantswarm/operatorkit/v7

go 1.17
go 1.21

require (
github.com/getsentry/sentry-go v0.12.0
github.com/getsentry/sentry-go v0.25.0
github.com/giantswarm/backoff v1.0.0
github.com/giantswarm/exporterkit v1.0.0
github.com/giantswarm/k8sclient/v7 v7.0.1
github.com/giantswarm/microerror v0.4.0
github.com/giantswarm/micrologger v0.6.0
github.com/giantswarm/exporterkit v1.1.0
github.com/giantswarm/k8sclient/v7 v7.2.0
github.com/giantswarm/microerror v0.4.1
github.com/giantswarm/micrologger v1.1.1
github.com/giantswarm/to v0.4.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v1.12.1
github.com/prometheus/client_model v0.2.0
github.com/stretchr/testify v1.7.0
k8s.io/api v0.20.15
k8s.io/apiextensions-apiserver v0.20.15
k8s.io/apimachinery v0.20.15
k8s.io/client-go v0.20.15
sigs.k8s.io/controller-runtime v0.8.3
sigs.k8s.io/yaml v1.3.0
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.5.0
github.com/stretchr/testify v1.8.4
k8s.io/api v0.28.3
k8s.io/apiextensions-apiserver v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v0.4.0 // 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.7.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/golang/protobuf v1.5.3 // 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/uuid v1.4.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/onsi/ginkgo v1.16.2 // indirect
github.com/onsi/gomega v1.13.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.4.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
k8s.io/component-base v0.20.15 // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513 // indirect
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.28.3 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace (
github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
github.com/spf13/viper => github.com/spf13/viper v1.9.0
)
replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1

0 comments on commit ac4a5cf

Please sign in to comment.