Skip to content

Commit 7ff3542

Browse files
authored
Merge pull request #417 from fidelity/dependabot/go_modules/github.com/fluxcd/pkg/apis/meta-1.5.0
feat: Jul Release
2 parents aa811ba + 440792d commit 7ff3542

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3460
-1303
lines changed

.github/workflows/main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/setup-go@v2
3939
with:
4040
# The Go version to download (if necessary) and use. Supports semver spec and ranges.
41-
go-version: 1.22.2
41+
go-version: 1.22.4
4242
- name: Setup dependencies
4343
run: |
4444
[ -z "${GOPATH}" ] && export GOPATH=$HOME/go

PROJECT

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
domain: io
2+
projectName: kraan-controller
3+
layout:
4+
- go.kubebuilder.io/v4
25
repo: github.com/fidelity/kraan
36
resources:
4-
- group: kraan
7+
- api:
8+
crdVersion: v1alpha1
9+
namespaced: false
10+
group: kraan
511
kind: AddonsLayer
612
version: v1alpha1
7-
version: "2"
13+
version: "3"

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.3.40
1+
v0.3.41

chart/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
description: A Helm chart for kraan controller
33
name: kraan-controller
44
type: application
5-
appVersion: v0.3.40
6-
version: v0.3.40
5+
appVersion: v0.3.41
6+
version: v0.3.41

chart/templates/gotk/helm-controller/crd.yaml

+2,298-805
Large diffs are not rendered by default.

chart/templates/gotk/source-controller/crds.yaml

+882-190
Large diffs are not rendered by default.

chart/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ gotk:
103103
image:
104104
repository: ghcr.io/fluxcd
105105
name: source-controller
106-
tag: v1.2.5
106+
tag: v1.3.0
107107
imagePullPolicy:
108108

109109
imagePullSecrets:
@@ -163,7 +163,7 @@ gotk:
163163
image:
164164
repository: ghcr.io/fluxcd
165165
name: helm-controller
166-
tag: v0.37.4
166+
tag: v1.0.1
167167
imagePullPolicy:
168168

169169
proxy: true

controllers/addons_controller.go

+108-144
Large diffs are not rendered by default.

docs/design/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For more details on *HelmRelease*, check
4949
```yaml
5050
# podinfo.yaml
5151
---
52-
apiVersion: helm.toolkit.fluxcd.io/v2beta2
52+
apiVersion: helm.toolkit.fluxcd.io/v2
5353
kind: HelmRelease
5454
metadata:
5555
name: podinfo

go.mod

+23-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
module github.com/fidelity/kraan
22

3-
go 1.22
3+
go 1.22.0
44

5-
toolchain go1.22.1
5+
toolchain go1.22.4
66

77
require (
8-
github.com/fluxcd/helm-controller/api v0.37.4
9-
github.com/fluxcd/pkg/apis/meta v1.4.0
8+
github.com/fluxcd/helm-controller/api v1.0.1
9+
github.com/fluxcd/pkg/apis/meta v1.5.0
1010
github.com/fluxcd/pkg/untar v0.3.0
11-
github.com/fluxcd/source-controller/api v1.2.5
12-
github.com/go-logr/logr v1.4.1
11+
github.com/fluxcd/source-controller/api v1.3.0
12+
github.com/go-logr/logr v1.4.2
1313
github.com/golang/mock v1.6.0
1414
github.com/google/go-cmp v0.6.0
1515
github.com/paulcarlton-ww/goutils/pkg/testutils v0.1.42
1616
github.com/pkg/errors v0.9.1
17-
github.com/prometheus/client_golang v1.19.0
17+
github.com/prometheus/client_golang v1.19.1
1818
go.uber.org/zap v1.27.0
19-
golang.org/x/mod v0.17.0
20-
k8s.io/api v0.28.6
21-
k8s.io/apiextensions-apiserver v0.28.6
22-
k8s.io/apimachinery v0.29.3
23-
k8s.io/client-go v0.28.6
24-
sigs.k8s.io/controller-runtime v0.16.3
19+
golang.org/x/mod v0.18.0
20+
k8s.io/api v0.30.0
21+
k8s.io/apiextensions-apiserver v0.30.0
22+
k8s.io/apimachinery v0.30.0
23+
k8s.io/client-go v0.30.0
24+
sigs.k8s.io/controller-runtime v0.18.1
2525
)
2626

2727
require (
@@ -31,12 +31,12 @@ require (
3131
github.com/davecgh/go-spew v1.1.1 // indirect
3232
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3333
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
34-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
35-
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
36-
github.com/fluxcd/pkg/apis/kustomize v1.3.0 // indirect
34+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
35+
github.com/fluxcd/pkg/apis/acl v0.3.0 // indirect
36+
github.com/fluxcd/pkg/apis/kustomize v1.5.0 // indirect
3737
github.com/fluxcd/pkg/tar v0.2.0 // indirect
38-
github.com/fsnotify/fsnotify v1.6.0 // indirect
39-
github.com/go-logr/zapr v1.2.4 // indirect
38+
github.com/fsnotify/fsnotify v1.7.0 // indirect
39+
github.com/go-logr/zapr v1.3.0 // indirect
4040
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4141
github.com/go-openapi/jsonreference v0.20.2 // indirect
4242
github.com/go-openapi/swag v0.22.3 // indirect
@@ -61,10 +61,10 @@ require (
6161
github.com/spf13/pflag v1.0.5 // indirect
6262
go.uber.org/multierr v1.11.0 // indirect
6363
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
64-
golang.org/x/net v0.23.0 // indirect
64+
golang.org/x/net v0.24.0 // indirect
6565
golang.org/x/oauth2 v0.16.0 // indirect
66-
golang.org/x/sys v0.18.0 // indirect
67-
golang.org/x/term v0.18.0 // indirect
66+
golang.org/x/sys v0.19.0 // indirect
67+
golang.org/x/term v0.19.0 // indirect
6868
golang.org/x/text v0.14.0 // indirect
6969
golang.org/x/time v0.3.0 // indirect
7070
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -73,9 +73,8 @@ require (
7373
gopkg.in/inf.v0 v0.9.1 // indirect
7474
gopkg.in/yaml.v2 v2.4.0 // indirect
7575
gopkg.in/yaml.v3 v3.0.1 // indirect
76-
k8s.io/component-base v0.28.6 // indirect
77-
k8s.io/klog/v2 v2.110.1 // indirect
78-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
76+
k8s.io/klog/v2 v2.120.1 // indirect
77+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
7978
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
8079
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8180
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)