Skip to content

Commit d4588a2

Browse files
mbaldessarimbaldessari
authored
Merge pull request #564 from mbaldessari/update-helm-vendoring2
Update helm and argo packages
2 parents 1a6026d + 1fd750a commit d4588a2

2,273 files changed

Lines changed: 122291 additions & 119406 deletions

File tree

Some content is hidden

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

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.24.6
1+
ARG GO_VERSION=1.25.7
22
FROM registry.access.redhat.com/ubi9/go-toolset:${GO_VERSION} AS builder
33
ARG GOARCH=amd64
44

‎api/v1alpha1/pattern_types.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,10 @@ type GitOpsConfig struct {
161161
// This structure is part of the PatternStatus as an array
162162
// The Application Status will be included as part of the Observed state of Pattern
163163
type PatternApplicationInfo struct {
164-
Name string `json:"name,omitempty"`
165-
Namespace string `json:"namespace,omitempty"`
166-
AppSyncStatus string `json:"syncStatus,omitempty"`
167-
AppHealthStatus string `json:"healthStatus,omitempty"`
168-
AppHealthMessage string `json:"healthMessage,omitempty"`
164+
Name string `json:"name,omitempty"`
165+
Namespace string `json:"namespace,omitempty"`
166+
AppSyncStatus string `json:"syncStatus,omitempty"`
167+
AppHealthStatus string `json:"healthStatus,omitempty"`
169168
}
170169

171170
// PatternStatus defines the observed state of Pattern

‎config/crd/bases/gitops.hybrid-cloud-patterns.io_patterns.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ spec:
174174
This structure is part of the PatternStatus as an array
175175
The Application Status will be included as part of the Observed state of Pattern
176176
properties:
177-
healthMessage:
178-
type: string
179177
healthStatus:
180178
type: string
181179
name:

‎go.mod‎

Lines changed: 73 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hybrid-cloud-patterns/patterns-operator
22

3-
go 1.24.6
3+
go 1.25.5
44

55
require (
66
code.gitea.io/sdk/gitea v0.23.2
@@ -10,58 +10,62 @@ require (
1010
github.com/go-errors/errors v1.5.1
1111
github.com/go-git/go-git/v5 v5.18.0
1212
github.com/go-logr/logr v1.4.3
13-
github.com/google/uuid v1.6.0
13+
github.com/google/uuid v1.6.1-0.20241114170450-2d3c2a9cc518
1414
github.com/onsi/ginkgo/v2 v2.28.1
1515
github.com/onsi/gomega v1.39.1
1616
github.com/openshift/api v3.9.0+incompatible
17-
github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e // release-4.16
17+
github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c // release-4.21
1818
github.com/operator-framework/api v0.33.0
1919
github.com/operator-framework/operator-lifecycle-manager v0.29.0
2020
github.com/segmentio/analytics-go/v3 v3.3.0
2121
go.uber.org/mock v0.6.0
2222
golang.org/x/crypto v0.47.0
2323
gopkg.in/yaml.v3 v3.0.1
24-
helm.sh/helm/v3 v3.18.6
25-
k8s.io/api v0.33.4
24+
helm.sh/helm/v3 v3.19.5
25+
k8s.io/api v0.34.2
2626
k8s.io/apimachinery v0.36.0-alpha.1
2727
k8s.io/client-go v12.0.0+incompatible
2828
sigs.k8s.io/controller-runtime v0.21.0
2929
)
3030

3131
require (
32-
github.com/argoproj/argo-cd/v3 v3.0.23
32+
github.com/argoproj/argo-cd/v3 v3.3.6
3333
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250308055145-5fe7bb3edc86
3434
sigs.k8s.io/controller-tools v0.16.4
3535
)
3636

3737
require (
3838
cloud.google.com/go/compute/metadata v0.9.0 // indirect
39+
cyphar.com/go-pathrs v0.2.1 // indirect
3940
dario.cat/mergo v1.0.2 // indirect
4041
github.com/42wim/httpsig v1.2.3 // indirect
41-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
42-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0 // indirect
42+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 // indirect
43+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
4344
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
4445
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
45-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
46+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
4647
github.com/BurntSushi/toml v1.5.0 // indirect
4748
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4849
github.com/Masterminds/goutils v1.1.1 // indirect
4950
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
5051
github.com/Microsoft/go-winio v0.6.2 // indirect
5152
github.com/ProtonMail/go-crypto v1.1.6 // indirect
52-
github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3 // indirect
53+
github.com/argoproj/gitops-engine v0.7.1-0.20250908182407-97ad5b59a627 // indirect
5354
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect
55+
github.com/argoproj/pkg/v2 v2.0.1 // indirect
5456
github.com/beorn7/perks v1.0.1 // indirect
5557
github.com/blang/semver/v4 v4.0.0 // indirect
5658
github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
5759
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
5860
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
59-
github.com/casbin/casbin/v2 v2.127.0 // indirect
61+
github.com/casbin/casbin/v2 v2.135.0 // indirect
6062
github.com/casbin/govaluate v1.10.0 // indirect
63+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
6164
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6265
github.com/chai2010/gettext-go v1.0.3 // indirect
66+
github.com/chainguard-dev/git-urls v1.0.2 // indirect
6367
github.com/cloudflare/circl v1.6.3 // indirect
64-
github.com/cyphar/filepath-securejoin v0.5.0 // indirect
68+
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
6569
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6670
github.com/davidmz/go-pageant v1.0.2 // indirect
6771
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -79,9 +83,8 @@ require (
7983
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
8084
github.com/go-git/go-billy/v5 v5.8.0 // indirect
8185
github.com/go-logr/zapr v1.3.0 // indirect
82-
github.com/go-ole/go-ole v1.3.0 // indirect
8386
github.com/go-openapi/jsonpointer v0.22.1 // indirect
84-
github.com/go-openapi/jsonreference v0.21.2 // indirect
87+
github.com/go-openapi/jsonreference v0.21.3 // indirect
8588
github.com/go-openapi/swag v0.25.1 // indirect
8689
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
8790
github.com/go-openapi/swag/conv v0.25.1 // indirect
@@ -103,13 +106,12 @@ require (
103106
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
104107
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
105108
github.com/google/btree v1.1.3 // indirect
106-
github.com/google/gnostic-models v0.6.9 // indirect
109+
github.com/google/gnostic-models v0.7.0 // indirect
107110
github.com/google/go-cmp v0.7.0 // indirect
108-
github.com/google/go-github/v66 v66.0.0 // indirect
111+
github.com/google/go-github/v69 v69.2.0 // indirect
109112
github.com/google/go-github/v75 v75.0.0 // indirect
110113
github.com/google/go-querystring v1.1.0 // indirect
111114
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
112-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
113115
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
114116
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
115117
github.com/hashicorp/go-version v1.7.0 // indirect
@@ -123,7 +125,6 @@ require (
123125
github.com/klauspost/compress v1.18.0 // indirect
124126
github.com/kylelemons/godebug v1.1.0 // indirect
125127
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
126-
github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 // indirect
127128
github.com/mattn/go-colorable v0.1.13 // indirect
128129
github.com/mattn/go-isatty v0.0.20 // indirect
129130
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -132,47 +133,43 @@ require (
132133
github.com/moby/spdystream v0.5.1 // indirect
133134
github.com/moby/term v0.5.2 // indirect
134135
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
135-
github.com/modern-go/reflect2 v1.0.2 // indirect
136+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
136137
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
137138
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
138139
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
139140
github.com/opencontainers/go-digest v1.0.0 // indirect
140141
github.com/opencontainers/image-spec v1.1.1 // indirect
141-
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
142+
github.com/patrickmn/go-cache v2.1.1-0.20191004192108-46f407853014+incompatible // indirect
142143
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
143144
github.com/pjbgf/sha1cd v0.3.2 // indirect
144145
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
145146
github.com/pkg/errors v0.9.1 // indirect
146-
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
147+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
147148
github.com/prometheus/client_golang v1.23.2 // indirect
148149
github.com/prometheus/client_model v0.6.2 // indirect
149150
github.com/prometheus/common v0.66.1 // indirect
150151
github.com/prometheus/procfs v0.16.1 // indirect
151152
github.com/redis/go-redis/v9 v9.8.0 // indirect
152-
github.com/robfig/cron/v3 v3.0.1 // indirect
153+
github.com/robfig/cron/v3 v3.0.2-0.20210106135023-bc59245fe10e // indirect
153154
github.com/russross/blackfriday/v2 v2.1.0 // indirect
154155
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
155156
github.com/segmentio/backo-go v1.0.0 // indirect
156157
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
157-
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
158158
github.com/shopspring/decimal v1.4.0 // indirect
159159
github.com/sirupsen/logrus v1.9.3 // indirect
160160
github.com/skeema/knownhosts v1.3.1 // indirect
161161
github.com/spf13/afero v1.12.0 // indirect
162162
github.com/spf13/cast v1.7.1 // indirect
163-
github.com/spf13/cobra v1.9.1 // indirect
163+
github.com/spf13/cobra v1.10.2 // indirect
164164
github.com/spf13/pflag v1.0.10 // indirect
165-
github.com/tklauser/go-sysconf v0.3.15 // indirect
166-
github.com/tklauser/numcpus v0.10.0 // indirect
167165
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
168-
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
166+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
169167
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
170168
github.com/x448/float16 v0.8.4 // indirect
171169
github.com/xanzy/ssh-agent v0.3.3 // indirect
172170
github.com/xlab/treeprint v1.2.0 // indirect
173-
github.com/yusufpapurcu/wmi v1.2.4 // indirect
174-
go.opentelemetry.io/otel v1.39.0 // indirect
175-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
171+
go.opentelemetry.io/otel v1.40.0 // indirect
172+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
176173
go.uber.org/multierr v1.11.0 // indirect
177174
go.uber.org/zap v1.27.0 // indirect
178175
go.yaml.in/yaml/v2 v2.4.3 // indirect
@@ -184,9 +181,8 @@ require (
184181
golang.org/x/sys v0.40.0 // indirect
185182
golang.org/x/term v0.39.0 // indirect
186183
golang.org/x/text v0.33.0 // indirect
187-
golang.org/x/time v0.12.0 // indirect
184+
golang.org/x/time v0.14.0 // indirect
188185
golang.org/x/tools v0.41.0 // indirect
189-
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
190186
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
191187
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
192188
google.golang.org/grpc v1.79.3 // indirect
@@ -195,62 +191,62 @@ require (
195191
gopkg.in/inf.v0 v0.9.1 // indirect
196192
gopkg.in/warnings.v0 v0.1.2 // indirect
197193
gopkg.in/yaml.v2 v2.4.0 // indirect
198-
k8s.io/apiextensions-apiserver v0.33.4 // indirect
199-
k8s.io/apiserver v0.33.4 // indirect
200-
k8s.io/cli-runtime v0.33.4 // indirect
201-
k8s.io/component-base v0.33.4 // indirect
202-
k8s.io/component-helpers v0.33.4 // indirect
203-
k8s.io/controller-manager v0.0.0 // indirect
194+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
195+
k8s.io/apiserver v0.34.2 // indirect
196+
k8s.io/cli-runtime v0.34.2 // indirect
197+
k8s.io/component-base v0.34.2 // indirect
198+
k8s.io/component-helpers v0.34.2 // indirect
199+
k8s.io/controller-manager v0.34.0 // indirect
204200
k8s.io/klog/v2 v2.130.1 // indirect
205-
k8s.io/kube-aggregator v0.33.4 // indirect
206-
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
207-
k8s.io/kubectl v0.33.3 // indirect
208-
k8s.io/kubernetes v1.32.2 // indirect
201+
k8s.io/kube-aggregator v0.34.0 // indirect
202+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
203+
k8s.io/kubectl v0.34.2 // indirect
204+
k8s.io/kubernetes v1.34.2 // indirect
209205
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
210206
oras.land/oras-go/v2 v2.6.0 // indirect
211207
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
212-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
213-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
208+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
209+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
214210
sigs.k8s.io/randfill v1.0.0 // indirect
215-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
211+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1-0.20251003215857-446d8398e19c // indirect
216212
sigs.k8s.io/yaml v1.6.0 // indirect
217213
)
218214

219215
replace (
220216
// Usually not needed unless we have newer k8s.io deps and argocd still uses an old gitops-engine
221217
// github.com/argoproj/gitops-engine => github.com/argoproj/gitops-engine v0.0.0-20240905010810-bd7681ae3f8b
222-
github.com/openshift/api => github.com/openshift/api v0.0.0-20240124164020-e2ce40831f2e
223-
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e
218+
github.com/openshift/api => github.com/openshift/api v0.0.0-20251204164930-cd2e40c5883a
219+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c
224220
// Caused by Argo importing 'k8s.io/api'
225221
// Override all the v0.0.0 entries
226-
k8s.io/api => k8s.io/api v0.33.4
227-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4
228-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.4
229-
k8s.io/apiserver => k8s.io/apiserver v0.33.4
230-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4
231-
k8s.io/client-go => k8s.io/client-go v0.33.4
232-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4
233-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4
234-
k8s.io/code-generator => k8s.io/code-generator v0.33.4
235-
k8s.io/component-base => k8s.io/component-base v0.33.4
236-
k8s.io/component-helpers => k8s.io/component-helpers v0.33.4
237-
k8s.io/controller-manager => k8s.io/controller-manager v0.33.4
238-
k8s.io/cri-api => k8s.io/cri-api v0.33.4
239-
k8s.io/cri-client => k8s.io/cri-client v0.33.4
240-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4
241-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.4
242-
k8s.io/endpointslice => k8s.io/endpointslice v0.33.4
243-
k8s.io/externaljwt => k8s.io/externaljwt v0.33.4
244-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4
245-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4
246-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4
247-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4
248-
k8s.io/kubectl => k8s.io/kubectl v0.33.4
249-
k8s.io/kubelet => k8s.io/kubelet v0.33.4
250-
k8s.io/kubernetes => k8s.io/kubernetes v1.33.4
251-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.4
252-
k8s.io/metrics => k8s.io/metrics v0.33.4
253-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.4
254-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4
255-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4
222+
k8s.io/api => k8s.io/api v0.34.2
223+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.2
224+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.2
225+
k8s.io/apiserver => k8s.io/apiserver v0.34.2
226+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.2
227+
k8s.io/client-go => k8s.io/client-go v0.34.2
228+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.2
229+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.2
230+
k8s.io/code-generator => k8s.io/code-generator v0.34.2
231+
k8s.io/component-base => k8s.io/component-base v0.34.2
232+
k8s.io/component-helpers => k8s.io/component-helpers v0.34.2
233+
k8s.io/controller-manager => k8s.io/controller-manager v0.34.2
234+
k8s.io/cri-api => k8s.io/cri-api v0.34.2
235+
k8s.io/cri-client => k8s.io/cri-client v0.34.2
236+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.2
237+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.2
238+
k8s.io/endpointslice => k8s.io/endpointslice v0.34.2
239+
k8s.io/externaljwt => k8s.io/externaljwt v0.34.2
240+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.2
241+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.2
242+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.2
243+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.2
244+
k8s.io/kubectl => k8s.io/kubectl v0.34.2
245+
k8s.io/kubelet => k8s.io/kubelet v0.34.2
246+
k8s.io/kubernetes => k8s.io/kubernetes v1.34.2
247+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.2
248+
k8s.io/metrics => k8s.io/metrics v0.34.2
249+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.2
250+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.2
251+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.2
256252
)

0 commit comments

Comments
 (0)