Skip to content

Commit

Permalink
Merge pull request #417 from fidelity/dependabot/go_modules/github.co…
Browse files Browse the repository at this point in the history
…m/fluxcd/pkg/apis/meta-1.5.0

feat: Jul Release
  • Loading branch information
michael12312 authored Jul 10, 2024
2 parents aa811ba + 440792d commit 7ff3542
Show file tree
Hide file tree
Showing 42 changed files with 3,460 additions and 1,303 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/setup-go@v2
with:
# The Go version to download (if necessary) and use. Supports semver spec and ranges.
go-version: 1.22.2
go-version: 1.22.4
- name: Setup dependencies
run: |
[ -z "${GOPATH}" ] && export GOPATH=$HOME/go
Expand Down
10 changes: 8 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
domain: io
projectName: kraan-controller
layout:
- go.kubebuilder.io/v4
repo: github.com/fidelity/kraan
resources:
- group: kraan
- api:
crdVersion: v1alpha1
namespaced: false
group: kraan
kind: AddonsLayer
version: v1alpha1
version: "2"
version: "3"
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.40
v0.3.41
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
description: A Helm chart for kraan controller
name: kraan-controller
type: application
appVersion: v0.3.40
version: v0.3.40
appVersion: v0.3.41
version: v0.3.41
3,103 changes: 2,298 additions & 805 deletions chart/templates/gotk/helm-controller/crd.yaml

Large diffs are not rendered by default.

1,072 changes: 882 additions & 190 deletions chart/templates/gotk/source-controller/crds.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ gotk:
image:
repository: ghcr.io/fluxcd
name: source-controller
tag: v1.2.5
tag: v1.3.0
imagePullPolicy:

imagePullSecrets:
Expand Down Expand Up @@ -163,7 +163,7 @@ gotk:
image:
repository: ghcr.io/fluxcd
name: helm-controller
tag: v0.37.4
tag: v1.0.1
imagePullPolicy:

proxy: true
Expand Down
252 changes: 108 additions & 144 deletions controllers/addons_controller.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/design/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ For more details on *HelmRelease*, check
```yaml
# podinfo.yaml
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down
47 changes: 23 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
module github.com/fidelity/kraan

go 1.22
go 1.22.0

toolchain go1.22.1
toolchain go1.22.4

require (
github.com/fluxcd/helm-controller/api v0.37.4
github.com/fluxcd/pkg/apis/meta v1.4.0
github.com/fluxcd/helm-controller/api v1.0.1
github.com/fluxcd/pkg/apis/meta v1.5.0
github.com/fluxcd/pkg/untar v0.3.0
github.com/fluxcd/source-controller/api v1.2.5
github.com/go-logr/logr v1.4.1
github.com/fluxcd/source-controller/api v1.3.0
github.com/go-logr/logr v1.4.2
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.6.0
github.com/paulcarlton-ww/goutils/pkg/testutils v0.1.42
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_golang v1.19.1
go.uber.org/zap v1.27.0
golang.org/x/mod v0.17.0
k8s.io/api v0.28.6
k8s.io/apiextensions-apiserver v0.28.6
k8s.io/apimachinery v0.29.3
k8s.io/client-go v0.28.6
sigs.k8s.io/controller-runtime v0.16.3
golang.org/x/mod v0.18.0
k8s.io/api v0.30.0
k8s.io/apiextensions-apiserver v0.30.0
k8s.io/apimachinery v0.30.0
k8s.io/client-go v0.30.0
sigs.k8s.io/controller-runtime v0.18.1
)

require (
Expand All @@ -31,12 +31,12 @@ require (
github.com/davecgh/go-spew v1.1.1 // 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.6.0 // indirect
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
github.com/fluxcd/pkg/apis/kustomize v1.3.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fluxcd/pkg/apis/acl v0.3.0 // indirect
github.com/fluxcd/pkg/apis/kustomize v1.5.0 // indirect
github.com/fluxcd/pkg/tar v0.2.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // 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
Expand All @@ -61,10 +61,10 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
Expand All @@ -73,9 +73,8 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.28.6 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
Loading

0 comments on commit 7ff3542

Please sign in to comment.