Skip to content

Commit 04cd939

Browse files
stefanprodanstefanprodan
authored
Merge pull request #1024 from fluxcd/sc-v1.2.2
Update source-controller to v1.2.2
2 parents 30a0d86 + dfb2dcc commit 04cd939

File tree

5 files changed

+68
-75
lines changed

5 files changed

+68
-75
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
golang.org/x/text v0.14.0 // indirect
2525
gopkg.in/inf.v0 v0.9.1 // indirect
2626
gopkg.in/yaml.v2 v2.4.0 // indirect
27-
k8s.io/klog/v2 v2.100.1 // indirect
28-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
27+
k8s.io/klog/v2 v2.110.1 // indirect
28+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
2929
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
3030
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
3131
sigs.k8s.io/yaml v1.4.0 // indirect

‎api/go.sum‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ github.com/fluxcd/pkg/apis/kustomize v1.2.0 h1:vkVs+OumxaWso0jNCqdgFFfMHdh+qtZhy
55
github.com/fluxcd/pkg/apis/kustomize v1.2.0/go.mod h1:VF7tR/WuVFeum+HaMTHwp+eCtsHiiQlY6ihgqtAnW/M=
66
github.com/fluxcd/pkg/apis/meta v1.2.0 h1:O766PzGAdMdQKybSflGL8oV0+GgCNIkdsxfalRyzeO8=
77
github.com/fluxcd/pkg/apis/meta v1.2.0/go.mod h1:fU/Az9AoVyIxC0oI4ihG0NVMNnvrcCzdEym3wxjIQsc=
8-
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
98
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
109
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1110
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
@@ -83,10 +82,10 @@ k8s.io/apiextensions-apiserver v0.28.4 h1:AZpKY/7wQ8n+ZYDtNHbAJBb+N4AXXJvyZx6ww6
8382
k8s.io/apiextensions-apiserver v0.28.4/go.mod h1:pgQIZ1U8eJSMQcENew/0ShUTlePcSGFq6dxSxf2mwPM=
8483
k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
8584
k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
86-
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
87-
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
88-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
89-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
85+
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
86+
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
87+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
88+
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
9089
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
9190
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
9291
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎config/default/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: kustomize-system
44
resources:
5-
- https://github.com/fluxcd/source-controller/releases/download/v1.2.0/source-controller.crds.yaml
6-
- https://github.com/fluxcd/source-controller/releases/download/v1.2.0/source-controller.deployment.yaml
5+
- https://github.com/fluxcd/source-controller/releases/download/v1.2.2/source-controller.crds.yaml
6+
- https://github.com/fluxcd/source-controller/releases/download/v1.2.2/source-controller.deployment.yaml
77
- ../crd
88
- ../rbac
99
- ../manager

‎go.mod‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ require (
2424
github.com/fluxcd/pkg/apis/meta v1.2.0
2525
github.com/fluxcd/pkg/http/fetch v0.7.0
2626
github.com/fluxcd/pkg/kustomize v1.5.0
27-
github.com/fluxcd/pkg/runtime v0.43.1
27+
github.com/fluxcd/pkg/runtime v0.43.2
2828
github.com/fluxcd/pkg/ssa v0.35.0
2929
github.com/fluxcd/pkg/tar v0.4.0
3030
github.com/fluxcd/pkg/testserver v0.5.0
31-
github.com/fluxcd/source-controller/api v1.2.1
31+
github.com/fluxcd/source-controller/api v1.2.2
3232
github.com/getsops/sops/v3 v3.8.1
3333
github.com/hashicorp/vault/api v1.10.0
3434
github.com/onsi/gomega v1.30.0
@@ -100,20 +100,20 @@ require (
100100
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
101101
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
102102
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
103-
github.com/fatih/color v1.15.0 // indirect
103+
github.com/fatih/color v1.16.0 // indirect
104104
github.com/fluxcd/pkg/sourceignore v0.4.0 // indirect
105-
github.com/fsnotify/fsnotify v1.6.0 // indirect
105+
github.com/fsnotify/fsnotify v1.7.0 // indirect
106106
github.com/getsops/gopgagent v0.0.0-20170926210634-4d7ea76ff71a // indirect
107107
github.com/go-errors/errors v1.5.1 // indirect
108108
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
109109
github.com/go-git/go-billy/v5 v5.5.0 // indirect
110-
github.com/go-git/go-git/v5 v5.10.1 // indirect
110+
github.com/go-git/go-git/v5 v5.11.0 // indirect
111111
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
112112
github.com/go-logr/logr v1.3.0 // indirect
113113
github.com/go-logr/zapr v1.3.0 // indirect
114-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
114+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
115115
github.com/go-openapi/jsonreference v0.20.2 // indirect
116-
github.com/go-openapi/swag v0.22.3 // indirect
116+
github.com/go-openapi/swag v0.22.4 // indirect
117117
github.com/gogo/protobuf v1.3.2 // indirect
118118
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
119119
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -138,18 +138,18 @@ require (
138138
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
139139
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
140140
github.com/hashicorp/hcl v1.0.0 // indirect
141-
github.com/imdario/mergo v0.3.15 // indirect
141+
github.com/imdario/mergo v0.3.16 // indirect
142142
github.com/inconshreveable/mousetrap v1.1.0 // indirect
143143
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
144144
github.com/josharian/intern v1.0.0 // indirect
145145
github.com/json-iterator/go v1.1.12 // indirect
146-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
146+
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
147147
github.com/kylelemons/godebug v1.1.0 // indirect
148148
github.com/lib/pq v1.10.9 // indirect
149149
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
150150
github.com/mailru/easyjson v0.7.7 // indirect
151151
github.com/mattn/go-colorable v0.1.13 // indirect
152-
github.com/mattn/go-isatty v0.0.17 // indirect
152+
github.com/mattn/go-isatty v0.0.20 // indirect
153153
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
154154
github.com/mitchellh/go-homedir v1.1.0 // indirect
155155
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -181,11 +181,11 @@ require (
181181
github.com/xlab/treeprint v1.2.0 // indirect
182182
github.com/zeebo/blake3 v0.2.3 // indirect
183183
go.opencensus.io v0.24.0 // indirect
184-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
184+
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
185185
go.uber.org/multierr v1.11.0 // indirect
186186
go.uber.org/zap v1.26.0 // indirect
187187
golang.org/x/crypto v0.16.0 // indirect
188-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
188+
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
189189
golang.org/x/mod v0.14.0 // indirect
190190
golang.org/x/oauth2 v0.15.0 // indirect
191191
golang.org/x/sync v0.5.0 // indirect
@@ -195,14 +195,14 @@ require (
195195
golang.org/x/time v0.5.0 // indirect
196196
golang.org/x/tools v0.16.0 // indirect
197197
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
198-
google.golang.org/api v0.149.0 // indirect
199-
google.golang.org/appengine v1.6.7 // indirect
200-
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
201-
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
202-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
198+
google.golang.org/api v0.153.0 // indirect
199+
google.golang.org/appengine v1.6.8 // indirect
200+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
201+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
202+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
203203
google.golang.org/grpc v1.59.0 // indirect
204204
google.golang.org/protobuf v1.31.0 // indirect
205-
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
205+
gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
206206
gopkg.in/inf.v0 v0.9.1 // indirect
207207
gopkg.in/ini.v1 v1.67.0 // indirect
208208
gopkg.in/warnings.v0 v0.1.2 // indirect
@@ -211,7 +211,7 @@ require (
211211
k8s.io/apiextensions-apiserver v0.28.4 // indirect
212212
k8s.io/cli-runtime v0.28.4 // indirect
213213
k8s.io/component-base v0.28.4 // indirect
214-
k8s.io/klog/v2 v2.100.1 // indirect
214+
k8s.io/klog/v2 v2.110.1 // indirect
215215
k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8 // indirect
216216
k8s.io/kubectl v0.28.4 // indirect
217217
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)