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.

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

chore: cherry pick for 1.2.2 #482

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
20aff87
Unify NATS CR description in Kyma dashboard (#378)
mmitoraj May 21, 2024
0176b6c
chore: add information about high availability of NATS servers (#365)
mfaizanse Jun 3, 2024
0062b33
deps(dependabot): bump google.golang.org/protobuf from 1.31.0 to 1.33…
dependabot[bot] Jul 5, 2024
55f83cc
deps(dependabot): bump golangci/golangci-lint-action from 4.0.0 to 6.…
dependabot[bot] Jul 5, 2024
ae8b3cc
deps(dependabot): bump github.com/docker/docker from 24.0.7+incompati…
dependabot[bot] Jul 5, 2024
c858421
deps(dependabot): bump amannn/action-semantic-pull-request from 5.4.0…
dependabot[bot] Jul 5, 2024
9afc7ac
chore: update go version to 1.22.5 (#390)
grischperl Jul 9, 2024
e2e8a84
deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.11…
dependabot[bot] Jul 9, 2024
5201cd2
chore: bump dependencies (#396)
mfaizanse Jul 16, 2024
8ebfaaa
deps(dependabot): upgrade modules fix multiple dependabot prs (#403)
muralov Jul 23, 2024
6d28969
deps(dependabot): bump github.com/onsi/gomega from 1.33.1 to 1.34.0 (…
dependabot[bot] Jul 29, 2024
a580f79
deps(dependabot): bump github.com/docker/docker from 25.0.5+incompati…
dependabot[bot] Jul 31, 2024
626db80
deps(dependabot): bump github.com/onsi/gomega from 1.34.0 to 1.34.1 (…
dependabot[bot] Aug 5, 2024
229c634
deps(dependabot): bump github.com/vektra/mockery/v2 from 2.43.2 to 2.…
dependabot[bot] Aug 5, 2024
73263e4
deps(dependabot): bump golangci/golangci-lint-action from 6.0.1 to 6.…
dependabot[bot] Aug 5, 2024
25d4da5
chore: bump dependencies (#415)
mfaizanse Aug 19, 2024
449f5c7
chore: bump dependencies (#417)
friedrichwilken Aug 22, 2024
e2c43e4
deps(dependabot): bump github.com/docker/docker from 26.1.4+incompati…
dependabot[bot] Aug 22, 2024
c741ce7
deps(dependabot): bump github.com/vektra/mockery/v2 from 2.44.2 to 2.…
dependabot[bot] Aug 26, 2024
a6e27c6
deps(dependabot): bump github.com/prometheus/client_golang from 1.20.…
dependabot[bot] Aug 26, 2024
d9a372b
chore: upgrade golangci-lint version to v1.60.3 (#422)
the1bit Sep 2, 2024
a10c7c2
deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.18…
dependabot[bot] Sep 3, 2024
eaef64c
deps(dependabot): bump github.com/onsi/gomega from 1.34.1 to 1.34.2 (…
dependabot[bot] Sep 3, 2024
b3d9d42
docs: update the contributing file (#423)
mmitoraj Sep 3, 2024
4d13ec5
deps(dependabot): bump github.com/prometheus/client_golang from 1.20.…
dependabot[bot] Sep 10, 2024
fd2c0b6
chore: added github action based build jobs (#431)
mfaizanse Sep 16, 2024
66b7f0e
chore: replace prow build job waiting with github action (#433)
mfaizanse Sep 18, 2024
bd4e6d4
chore: image bump (#432)
grischperl Sep 18, 2024
1e6249b
chore: bump golang version to 1.23.1 (#434)
grischperl Sep 18, 2024
3dce357
fix: remove prow reference (#436)
mfaizanse Sep 19, 2024
ad2b2d7
deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.0 to 2.…
dependabot[bot] Sep 30, 2024
e63598b
deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.20…
dependabot[bot] Oct 2, 2024
bdd6997
deps(dependabot): bump golangci/golangci-lint-action from 6.1.0 to 6.…
dependabot[bot] Oct 8, 2024
7935fe3
deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.1 to 2.…
dependabot[bot] Oct 8, 2024
1a1c784
deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.2 to 2.…
dependabot[bot] Oct 17, 2024
7dc36a6
deps(dependabot): bump helm.sh/helm/v3 from 3.16.1 to 3.16.2 (#444)
dependabot[bot] Oct 17, 2024
94d1690
deps(dependabot): bump github.com/prometheus/client_golang from 1.20.…
dependabot[bot] Oct 21, 2024
0ed37eb
deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.21…
dependabot[bot] Oct 23, 2024
93c8750
deps(dependabot): bump sigs.k8s.io/controller-runtime from 0.19.0 to …
dependabot[bot] Oct 28, 2024
8635dda
deps(dependabot): bump k8s.io/apiextensions-apiserver from 0.31.1 to …
dependabot[bot] Oct 28, 2024
50580f2
deps(dependabot): bump kyma-project/prod/external/library/golang from…
dependabot[bot] Oct 28, 2024
2c7d703
docs: remove a broken link (#447)
nataliasitko Oct 28, 2024
05a3637
deps(dependabot): bump k8s.io/cli-runtime from 0.31.1 to 0.31.2 (#454)
dependabot[bot] Nov 5, 2024
b1e0e90
deps(dependabot): bump github.com/onsi/gomega from 1.34.2 to 1.35.1 (…
dependabot[bot] Nov 11, 2024
29c73bb
deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.3 to 2.…
dependabot[bot] Nov 18, 2024
05971a0
deps(dependabot): bump helm.sh/helm/v3 from 3.16.2 to 3.16.3 (#456)
dependabot[bot] Nov 19, 2024
b318f1f
docs: replace Remedy with Solution (#458)
NHingerl Nov 21, 2024
8d48a02
deps(dependabot): bump kyma-project/prod/external/library/golang from…
dependabot[bot] Nov 25, 2024
4902069
chore: upgrade depenedencies (#465)
muralov Dec 2, 2024
f1ea94e
deps(dependabot): bump kyma-project/prod/external/library/golang from…
dependabot[bot] Dec 10, 2024
acc12b6
deps(dependabot): bump sigs.k8s.io/controller-runtime from 0.19.2 to …
dependabot[bot] Dec 10, 2024
4185e27
deps(dependabot): bump github.com/vektra/mockery/v2 from 2.49.1 to 2.…
dependabot[bot] Dec 10, 2024
c94ba94
chore: bump dependencies (#470)
friedrichwilken Dec 11, 2024
846369b
fix: retry functions (#478)
friedrichwilken Dec 16, 2024
9c2e6b8
chore: bump dependencies and tooling (#481)
friedrichwilken Dec 17, 2024
11905a0
update sec-scenners-config
friedrichwilken Dec 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: bump dependencies (#415)
* chore: bump dependencies

* updated

* updated

* updated
  • Loading branch information
mfaizanse authored and friedrichwilken committed Dec 17, 2024
commit 25d4da50a621fe15cd3d39e3e6d33c146395ed39
4 changes: 4 additions & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ linters-settings:
alias: kscheme
- pkg: sigs.k8s.io/controller-runtime
alias: kcontrollerruntime
- pkg: "sigs.k8s.io/controller-runtime/pkg/reconcile"
alias: kcontrollerruntimereconcile
- pkg: github.com/onsi/gomega/types
alias: onsigomegatypes
- pkg: sigs.k8s.io/controller-runtime/pkg/log
Expand All @@ -165,6 +167,8 @@ linters-settings:
alias: klogzap
- pkg: github.com/kyma-project/nats-manager/pkg/k8s/mocks
alias: nmkmocks
- pkg: github.com/kyma-project/nats-manager/pkg/nats/mocks
alias: nmnatsmocks
- pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
alias: kapiextv1
- pkg: k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
CONTROLLER_TOOLS_VERSION ?= v0.16.1
GOLANG_CI_LINT_VERSION ?= v1.57

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
Expand Down
29 changes: 10 additions & 19 deletions config/crd/bases/operator.kyma-project.io_nats.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
name: nats.operator.kyma-project.io
spec:
group: operator.kyma-project.io
Expand Down Expand Up @@ -194,11 +194,9 @@ spec:
Claims lists the names of resources, defined in spec.resourceClaims,
that are used by this container.


This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate.


This field is immutable. It can only be set for containers.
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
Expand All @@ -209,6 +207,12 @@ spec:
the Pod where this field is used. It makes that resource available
inside a container.
type: string
request:
description: |-
Request is the name chosen for a request in the referenced claim.
If empty, everything from the claim is made available, otherwise
only the result of this request.
type: string
required:
- name
type: object
Expand Down Expand Up @@ -249,16 +253,8 @@ spec:
type: integer
conditions:
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -299,12 +295,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
37 changes: 9 additions & 28 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ kind: ClusterRole
metadata:
name: manager-role
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- list
- watch
- apiGroups:
- ""
resourceNames:
Expand All @@ -28,29 +21,23 @@ rules:
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups:
- ""
resources:
- nodes
- configmaps
- secrets
- services
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims
- events
verbs:
- delete
- list
- watch
- create
- patch
- apiGroups:
- ""
resources:
- nodes
- pods
verbs:
- get
Expand All @@ -59,8 +46,9 @@ rules:
- apiGroups:
- ""
resources:
- secrets
- persistentvolumeclaims
verbs:
- delete
- list
- watch
- apiGroups:
Expand All @@ -77,13 +65,6 @@ rules:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- services
verbs:
- list
- watch
- apiGroups:
- ""
resourceNames:
Expand Down
76 changes: 40 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ module github.com/kyma-project/nats-manager
go 1.22.5

require (
dario.cat/mergo v1.0.0
dario.cat/mergo v1.0.1
github.com/avast/retry-go/v3 v3.1.1
github.com/dustin/go-humanize v1.0.1
github.com/go-logr/logr v1.4.2
github.com/kelseyhightower/envconfig v1.4.0
github.com/nats-io/nats-server/v2 v2.10.18
github.com/nats-io/nats.go v1.36.0
github.com/nats-io/nats.go v1.37.0
github.com/onsi/gomega v1.34.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_golang v1.20.0
github.com/stretchr/testify v1.9.0
github.com/vektra/mockery/v2 v2.44.1
github.com/vektra/mockery/v2 v2.44.2
go.uber.org/zap v1.27.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.15.3
k8s.io/api v0.30.3
k8s.io/apiextensions-apiserver v0.30.3
k8s.io/apimachinery v0.30.3
k8s.io/cli-runtime v0.30.3
k8s.io/client-go v0.30.3
helm.sh/helm/v3 v3.15.4
k8s.io/api v0.31.0
k8s.io/apiextensions-apiserver v0.31.0
k8s.io/apimachinery v0.31.0
k8s.io/cli-runtime v0.31.0
k8s.io/client-go v0.31.0
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -40,13 +40,14 @@ require (
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/chigopher/pathlib v0.19.1 // indirect
github.com/containerd/containerd v1.7.12 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/cli v25.0.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
Expand All @@ -59,15 +60,16 @@ require (
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand All @@ -94,6 +96,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/lib/pq v1.10.9 // indirect
Expand All @@ -110,7 +113,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -124,60 +127,61 @@ require (
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rs/zerolog v1.29.0 // indirect
github.com/rubenv/sql-migrate v1.5.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.15.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/x448/float16 v0.8.4 // indirect
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.2.0 // 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.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.23.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiserver v0.30.3 // indirect
k8s.io/component-base v0.30.3 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/apiserver v0.31.0 // indirect
k8s.io/component-base v0.31.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubectl v0.30.0 // indirect
k8s.io/kubectl v0.30.3 // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // 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/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading