Skip to content

Commit accac00

Browse files
michael12312michael12312
authored
Merge pull request #404 from fidelity/dependabot/go_modules/golang.org/x/mod-0.14.0
feat: version to 0.3.38
2 parents 6be39a3 + f92f231 commit accac00

File tree

6 files changed

+53
-24
lines changed

6 files changed

+53
-24
lines changed

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.3.37
1+
v0.3.38

‎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.37
6-
version: v0.3.37
5+
appVersion: v0.3.38
6+
version: v0.3.38

‎go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ require (
77
github.com/fluxcd/pkg/apis/meta v1.2.0
88
github.com/fluxcd/pkg/untar v0.3.0
99
github.com/fluxcd/source-controller/api v1.2.3
10-
github.com/go-logr/logr v1.3.0
10+
github.com/go-logr/logr v1.4.1
1111
github.com/golang/mock v1.6.0
1212
github.com/google/go-cmp v0.6.0
1313
github.com/paulcarlton-ww/goutils/pkg/testutils v0.1.42
1414
github.com/pkg/errors v0.9.1
15-
github.com/prometheus/client_golang v1.17.0
15+
github.com/prometheus/client_golang v1.18.0
1616
go.uber.org/zap v1.26.0
1717
golang.org/x/mod v0.14.0
1818
k8s.io/api v0.28.4
@@ -49,19 +49,19 @@ require (
4949
github.com/json-iterator/go v1.1.12 // indirect
5050
github.com/kylelemons/godebug v1.1.0 // indirect
5151
github.com/mailru/easyjson v0.7.7 // indirect
52-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
52+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
5353
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5454
github.com/modern-go/reflect2 v1.0.2 // indirect
5555
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5656
github.com/paulcarlton-ww/goutils/pkg/logging v0.0.3 // indirect
57-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
58-
github.com/prometheus/common v0.44.0 // indirect
59-
github.com/prometheus/procfs v0.11.1 // indirect
57+
github.com/prometheus/client_model v0.5.0 // indirect
58+
github.com/prometheus/common v0.45.0 // indirect
59+
github.com/prometheus/procfs v0.12.0 // indirect
6060
github.com/spf13/pflag v1.0.5 // indirect
6161
go.uber.org/multierr v1.11.0 // indirect
6262
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
6363
golang.org/x/net v0.19.0 // indirect
64-
golang.org/x/oauth2 v0.8.0 // indirect
64+
golang.org/x/oauth2 v0.12.0 // indirect
6565
golang.org/x/sys v0.15.0 // indirect
6666
golang.org/x/term v0.15.0 // indirect
6767
golang.org/x/text v0.14.0 // indirect

‎go.sum

+14-14
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7
5353
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
5454
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
5555
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
56-
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
5756
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
57+
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
58+
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
5859
github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
5960
github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA=
6061
github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
@@ -149,8 +150,8 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
149150
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
150151
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
151152
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
152-
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
153-
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
153+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
154+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
154155
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
155156
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
156157
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@@ -182,15 +183,15 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
182183
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
183184
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
184185
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
185-
github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
186-
github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
186+
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
187+
github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
187188
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
188-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
189-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
190-
github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
191-
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
192-
github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
193-
github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
189+
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
190+
github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
191+
github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
192+
github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
193+
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
194+
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
194195
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
195196
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
196197
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -255,11 +256,10 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
255256
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
256257
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
257258
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
258-
golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
259-
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
259+
golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
260+
golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
260261
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
261262
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
262-
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
263263
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
264264
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
265265
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎main/main.go

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
// +kubebuilder:scaffold:imports
2626

27+
helmctlv1 "github.com/fluxcd/helm-controller/api/v2beta1"
2728
helmctlv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2829
sourcev1 "github.com/fluxcd/source-controller/api/v1"
2930
sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -56,6 +57,7 @@ var (
5657
func init() {
5758
log.SetLogger(zap.New())
5859
_ = corev1.AddToScheme(scheme) //nolint:errcheck // ok
60+
_ = helmctlv1.AddToScheme(scheme) //nolint:errcheck // ok
5961
_ = helmctlv2.AddToScheme(scheme) //nolint:errcheck // ok
6062
_ = kraanv1alpha1.AddToScheme(scheme) //nolint:errcheck // ok
6163
_ = sourcev1.AddToScheme(scheme) //nolint:errcheck // ok

‎pkg/apply/layerApplier.go

+27
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"strings"
1717
"time"
1818

19+
helmctlv1 "github.com/fluxcd/helm-controller/api/v2beta1"
1920
helmctlv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2021
fluxmeta "github.com/fluxcd/pkg/apis/meta"
2122
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -178,13 +179,39 @@ func (a KubectlLayerApplier) decodeHelmReleases(layer layers.Layer, objs []runti
178179
err = fmt.Errorf("failed to convert runtime.Object to HelmRelease")
179180
a.logError(err, err.Error(), layer, logging.GetObjNamespaceName(obj)...)
180181
}
182+
case *helmctlv1.HelmRelease:
183+
v1Hr, ok := obj.(*helmctlv1.HelmRelease)
184+
if ok {
185+
a.logDebug("found v1HelmRelease in Object list", layer, append(logging.GetObjKindNamespaceName(obj), "helmRelease", v1Hr)...)
186+
hr, convertErr := convertV1Hr(v1Hr)
187+
if convertErr != nil {
188+
err = convertErr
189+
a.logError(err, "v1HelmRelease conversion error. "+convertErr.Error(), layer, logging.GetObjNamespaceName(obj)...)
190+
} else {
191+
hrs = append(hrs, hr)
192+
}
193+
} else {
194+
err = fmt.Errorf("failed to convert runtime.Object to HelmRelease")
195+
a.logError(err, err.Error(), layer, logging.GetObjNamespaceName(obj)...)
196+
}
181197
default:
182198
a.logTrace("found Kubernetes object in Object list", layer, logging.GetObjKindNamespaceName(obj)...)
183199
}
184200
}
185201
return hrs, err
186202
}
187203

204+
func convertV1Hr(v1Hr *helmctlv1.HelmRelease) (hr *helmctlv2.HelmRelease, err error) {
205+
js, err := json.Marshal(&v1Hr)
206+
if err == nil {
207+
err = json.Unmarshal(js, &hr)
208+
if err == nil {
209+
hr.APIVersion = "helm.toolkit.fluxcd.io/v2beta2"
210+
}
211+
}
212+
return
213+
}
214+
188215
func (a KubectlLayerApplier) decodeHelmRepos(layer layers.Layer, objs []runtime.Object) (hrs []*sourcev1.HelmRepository, err error) {
189216
logging.TraceCall(a.getLog(layer))
190217
defer logging.TraceExit(a.getLog(layer))

0 commit comments

Comments
 (0)