Skip to content

Commit 955cf6a

Browse files
committed
Fix panic
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 1520331 commit 955cf6a

9 files changed

Lines changed: 39 additions & 38 deletions

File tree

go.mod

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ require (
4747
k8s.io/utils v0.0.0-20241210054802-24370beab758
4848
kmodules.xyz/apiversion v0.2.0
4949
kmodules.xyz/authorizer v0.29.1
50-
kmodules.xyz/client-go v0.32.0
50+
kmodules.xyz/client-go v0.32.1
5151
kmodules.xyz/custom-resources v0.30.2-0.20250303080226-05eb1392c05f
5252
kmodules.xyz/go-containerregistry v0.0.14
5353
kmodules.xyz/monitoring-agent-api v0.30.4
5454
kmodules.xyz/offshoot-api v0.32.0
55-
kmodules.xyz/resource-metadata v0.26.1-0.20250318202810-6ca41a0a8e08
55+
kmodules.xyz/resource-metadata v0.26.1
5656
kmodules.xyz/resource-metrics v0.30.6-0.20250302111458-dee2855523db
5757
kmodules.xyz/resource-metrics/utils v0.30.4
5858
kmodules.xyz/sets v0.29.0
5959
kubeops.dev/falco-ui-server v0.0.5-0.20250315021558-3b54bf551e3c
6060
kubeops.dev/scanner v0.0.19
61-
kubepack.dev/lib-app v0.3.1-0.20250315014402-772d33228d34
62-
kubepack.dev/lib-helm v0.29.16-0.20250315011604-b842237ac5b2
61+
kubepack.dev/lib-app v0.3.0
62+
kubepack.dev/lib-helm v0.32.0
6363
open-cluster-management.io/api v0.15.0
6464
sigs.k8s.io/cli-utils v0.37.2
6565
sigs.k8s.io/controller-runtime v0.20.3
@@ -68,8 +68,6 @@ require (
6868
x-helm.dev/apimachinery v0.0.17
6969
)
7070

71-
require go.virtual-secrets.dev/apimachinery v0.0.0-20250313131002-5cd148a87220 // indirect
72-
7371
require (
7472
cel.dev/expr v0.19.1 // indirect
7573
cloud.google.com/go v0.115.1 // indirect
@@ -296,6 +294,7 @@ require (
296294
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
297295
go.uber.org/multierr v1.11.0 // indirect
298296
go.uber.org/zap v1.27.0 // indirect
297+
go.virtual-secrets.dev/apimachinery v0.0.1 // indirect
299298
gocloud.dev v0.40.0 // indirect
300299
golang.org/x/crypto v0.36.0 // indirect
301300
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
@@ -351,7 +350,6 @@ require (
351350
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
352351
voyagermesh.dev/gateway-api v0.0.2-0.20241124132233-ced3a99a7eae // indirect
353352
voyagermesh.dev/installer v0.0.0-20241219103226-de800d167d8d // indirect
354-
355353
)
356354

357355
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -889,8 +889,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
889889
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
890890
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
891891
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
892-
go.virtual-secrets.dev/apimachinery v0.0.0-20250313131002-5cd148a87220 h1:XTo+GsEgYYqhwLBupwhjHYdDXhYjgND60Rx38EkudOc=
893-
go.virtual-secrets.dev/apimachinery v0.0.0-20250313131002-5cd148a87220/go.mod h1:Bs/6HMvNWpWbjds0e2Fuiow8QR0XAfY3MNv/neAsfxE=
892+
go.virtual-secrets.dev/apimachinery v0.0.1 h1:Xc8l+5yaH2bAHmqk5bkXTOFkOYjCZnhPoaVxtLJZRdM=
893+
go.virtual-secrets.dev/apimachinery v0.0.1/go.mod h1:DAilea9CBrKoDRbxoZ27jAW/df45KZy1iPDGTClKSTs=
894894
gocloud.dev v0.40.0 h1:f8LgP+4WDqOG/RXoUcyLpeIAGOcAbZrZbDQCUee10ng=
895895
gocloud.dev v0.40.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ=
896896
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1222,8 +1222,8 @@ kmodules.xyz/apply v0.29.0 h1:0OXGfE2IPuvXHk6uI9zp6KCYdBibx8mK4PEl0g3LZ44=
12221222
kmodules.xyz/apply v0.29.0/go.mod h1:bwToXErB+DC7/EEWjQVARCSbJBjGx5hIEuV1n0tC73g=
12231223
kmodules.xyz/authorizer v0.29.1 h1:uByGGoryKbZcfiEAhjcK/Y345I9mygNQP7DVpkMbNQQ=
12241224
kmodules.xyz/authorizer v0.29.1/go.mod h1:kZRhclL8twzyt2bQuJQJbpYww2sc+qFr8I5PPoq/sWY=
1225-
kmodules.xyz/client-go v0.32.0 h1:9KMvG9bKOTiKaDDUniCaxJTdnEwULxi8YLlHJP9spNQ=
1226-
kmodules.xyz/client-go v0.32.0/go.mod h1:tqe40/iDtO/RSNaDJs/a+rgnMPSOcK622HpOmOFvcds=
1225+
kmodules.xyz/client-go v0.32.1 h1:W8TWGBBaokQEqfesbdhlRFMMV0TChcRbMRQ0eTIRS88=
1226+
kmodules.xyz/client-go v0.32.1/go.mod h1:tqe40/iDtO/RSNaDJs/a+rgnMPSOcK622HpOmOFvcds=
12271227
kmodules.xyz/crd-schema-fuzz v0.32.0 h1:VATOsnCwmm7SrgnsBWqzcVx+C14l6rNREWrs1leBWaI=
12281228
kmodules.xyz/crd-schema-fuzz v0.32.0/go.mod h1:Fh2q+q60ZoQ6NQX0CWtZuXmu+Lnu8o1HofTaBBX7wYk=
12291229
kmodules.xyz/custom-resources v0.30.2-0.20250303080226-05eb1392c05f h1:JLpRh71RC/o6tsqyNJuaHCML/wD218G8Hh2dNm77DPU=
@@ -1234,8 +1234,8 @@ kmodules.xyz/monitoring-agent-api v0.30.4 h1:6CTKxYJKpWDsDYb0WRBHGFoW3xQof05d+W8
12341234
kmodules.xyz/monitoring-agent-api v0.30.4/go.mod h1:ZuTQ5uGi6H80QLsOTuuC7m58dfXDGUv0YB+s059gnr4=
12351235
kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o=
12361236
kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0=
1237-
kmodules.xyz/resource-metadata v0.26.1-0.20250318202810-6ca41a0a8e08 h1:IkTdJ0pOho0XJIp1kw2+fHdG5xTVU8ASlJP5crXCaiQ=
1238-
kmodules.xyz/resource-metadata v0.26.1-0.20250318202810-6ca41a0a8e08/go.mod h1:I3I7TwUF2eYwJ5sChhlAh+9QdGrsTL2PxhWXcBXQxOI=
1237+
kmodules.xyz/resource-metadata v0.26.1 h1:FKxvM8v5GkWWAnLHwnHGZNgewzNtKO7SDP+mRTA6M4g=
1238+
kmodules.xyz/resource-metadata v0.26.1/go.mod h1:E4scoxcEgd7NGLU69IiS0Qh+KnwYQ/ckZtDyA8ydZKs=
12391239
kmodules.xyz/resource-metrics v0.30.6-0.20250302111458-dee2855523db h1:c7CT+8pk6pWGsmdz3SmOp2Xjxio03IQxgUWb3TXNAN8=
12401240
kmodules.xyz/resource-metrics v0.30.6-0.20250302111458-dee2855523db/go.mod h1:o9XWJDUGFkADxhXdp2oeVofbbec0ZixfSq99ipUnTbA=
12411241
kmodules.xyz/resource-metrics/utils v0.30.4 h1:bJS/x0Qr7N1FFdxugFbzZ/Es6HVs4ptsFlhkmgj3jac=
@@ -1258,10 +1258,10 @@ kubeops.dev/sidekick v0.0.10 h1:/lOT+yV920F6TTPLc7bKR9HLAG/Yx+sTRm1C7rUz744=
12581258
kubeops.dev/sidekick v0.0.10/go.mod h1:VRyiiKGiJikv/8dNCkrXfkwZCv/2HoIhkmtNurs0gcM=
12591259
kubepack.dev/kubepack v0.29.2-0.20250315012528-cd494afd0133 h1:JqTmHxmIPD9YQG9xUTV1CDB5dlbTkMoSnxBCrxsQyLk=
12601260
kubepack.dev/kubepack v0.29.2-0.20250315012528-cd494afd0133/go.mod h1:/rkj9f1+kEVwLyn3zsGB31/01Yuu4CkKodvg9C1MbTE=
1261-
kubepack.dev/lib-app v0.3.1-0.20250315014402-772d33228d34 h1:YgOCVOcvkHgfS60dmo4IYdCUXLA+9IpFKUwr/j0n3Tc=
1262-
kubepack.dev/lib-app v0.3.1-0.20250315014402-772d33228d34/go.mod h1:QmxDqWNHMGT6ncJzUVBr+XbG7LhyCY8a0SnZf7LQpUU=
1263-
kubepack.dev/lib-helm v0.29.16-0.20250315011604-b842237ac5b2 h1:3Cr97OL3NopSKe8hRxu39fLLPhzTi4aSScBijbRHHVs=
1264-
kubepack.dev/lib-helm v0.29.16-0.20250315011604-b842237ac5b2/go.mod h1:7i+oNjsp+usbGWHLrz/M63JrpeKSoWiS1SLaT7dGROc=
1261+
kubepack.dev/lib-app v0.3.0 h1:8ZhPH185StVHXIEdE1X/3lKb91SQfmEzYC/mnLfmGqY=
1262+
kubepack.dev/lib-app v0.3.0/go.mod h1:wOesXXssrjUT9wDitVEysdwgSVa9QH3FqLfi7Mx3HQA=
1263+
kubepack.dev/lib-helm v0.32.0 h1:0hbzZv03DzaxttEy61ylprmUnVKxt47HUODGU8sHY/w=
1264+
kubepack.dev/lib-helm v0.32.0/go.mod h1:hL7aKa+njJbacrVTiYQYBWU3nbiDW+8+t0sYqoi0IjA=
12651265
kubevault.dev/apimachinery v0.20.1-0.20250302023338-2c22f1c1c74f h1:0t/8u8xSB/DAyc/VPauNLupYyT7gqAghH3K0fQNm520=
12661266
kubevault.dev/apimachinery v0.20.1-0.20250302023338-2c22f1c1c74f/go.mod h1:IWNygSeZJ8ycABG+UFuDeU9kj4NN1z9QOx65FUbj4lY=
12671267
moul.io/http2curl/v2 v2.3.1-0.20221024080105-10c404f653f7 h1:NykkTlRB+X40z86cLHdEmuoTxhNKhQebLT379b1EumA=

vendor/go.virtual-secrets.dev/apimachinery/apis/virtual/v1alpha1/openapi_generated.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.virtual-secrets.dev/apimachinery/apis/virtual/v1alpha1/secret_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ type Secret struct {
4040
// +optional
4141
metav1.ObjectMeta `json:"metadata,omitempty"`
4242

43-
// Name of the SecretSourceName object
44-
SecretSourceName string `json:"secretSourceName"`
43+
// Name of the SecretStoreName object
44+
SecretStoreName string `json:"secretStoreName"`
4545

4646
// Used to facilitate programmatic handling of secret data.
4747
// More meta: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types

vendor/go.virtual-secrets.dev/apimachinery/crds/config.virtual-secrets.dev_secretmetadatas.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ spec:
4646
properties:
4747
immutable:
4848
type: boolean
49-
secretSourceName:
49+
secretStoreName:
5050
type: string
5151
type:
5252
type: string
5353
required:
54-
- secretSourceName
54+
- secretStoreName
5555
type: object
5656
type: object
5757
served: true

vendor/go.virtual-secrets.dev/apimachinery/crds/config.virtual-secrets.dev_secretsources.yaml renamed to vendor/go.virtual-secrets.dev/apimachinery/crds/config.virtual-secrets.dev_secretstores.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ metadata:
44
creationTimestamp: null
55
labels:
66
app.kubernetes.io/name: virttual-secrets
7-
name: secretsources.config.virtual-secrets.dev
7+
name: secretstores.config.virtual-secrets.dev
88
spec:
99
group: config.virtual-secrets.dev
1010
names:
1111
categories:
1212
- meta
1313
- virtual-secrets
1414
- appscode
15-
kind: SecretSource
16-
listKind: SecretSourceList
17-
plural: secretsources
15+
kind: SecretStore
16+
listKind: SecretStoreList
17+
plural: secretstores
1818
shortNames:
1919
- scsource
20-
singular: secretsource
20+
singular: secretstore
2121
scope: Cluster
2222
versions:
2323
- additionalPrinterColumns:

vendor/go.virtual-secrets.dev/apimachinery/crds/virtual-secrets.dev_secrets.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
pattern: ^[a-z]([-a-z0-9]*[a-z0-9])?$
3737
type: string
3838
type: object
39-
secretSourceName:
39+
secretStoreName:
4040
type: string
4141
stringData:
4242
additionalProperties:
@@ -45,7 +45,7 @@ spec:
4545
type:
4646
type: string
4747
required:
48-
- secretSourceName
48+
- secretStoreName
4949
type: object
5050
served: true
5151
storage: true

vendor/kmodules.xyz/client-go/cluster/ocm.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
kmapi "kmodules.xyz/client-go/api/v1"
2525

2626
core "k8s.io/api/core/v1"
27+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2728
"k8s.io/apimachinery/pkg/api/meta"
2829
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2930
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -47,7 +48,9 @@ func IsOpenClusterSpoke(kc client.Reader) bool {
4748
list.SetKind("Klusterlet")
4849
err := kc.List(context.TODO(), &list)
4950
if err != nil {
50-
panic(err)
51+
if !meta.IsNoMatchError(err) && !apierrors.IsNotFound(err) {
52+
panic(err) // panic if 403 (missing rbac)
53+
}
5154
}
5255
return len(list.Items) > 0
5356
}

vendor/modules.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ go.uber.org/zap/internal/pool
14761476
go.uber.org/zap/internal/stacktrace
14771477
go.uber.org/zap/zapcore
14781478
go.uber.org/zap/zapgrpc
1479-
# go.virtual-secrets.dev/apimachinery v0.0.0-20250313131002-5cd148a87220
1479+
# go.virtual-secrets.dev/apimachinery v0.0.1
14801480
## explicit; go 1.23.0
14811481
go.virtual-secrets.dev/apimachinery/apis/virtual/v1alpha1
14821482
go.virtual-secrets.dev/apimachinery/crds
@@ -2751,7 +2751,7 @@ kmodules.xyz/authorizer/apiserver
27512751
kmodules.xyz/authorizer/rbac
27522752
kmodules.xyz/authorizer/rbac/helpers
27532753
kmodules.xyz/authorizer/rbac/validation
2754-
# kmodules.xyz/client-go v0.32.0
2754+
# kmodules.xyz/client-go v0.32.1
27552755
## explicit; go 1.23.0
27562756
kmodules.xyz/client-go
27572757
kmodules.xyz/client-go/api/v1
@@ -2789,7 +2789,7 @@ kmodules.xyz/monitoring-agent-api/client
27892789
kmodules.xyz/offshoot-api/api/v1
27902790
kmodules.xyz/offshoot-api/api/v2
27912791
kmodules.xyz/offshoot-api/util
2792-
# kmodules.xyz/resource-metadata v0.26.1-0.20250318202810-6ca41a0a8e08
2792+
# kmodules.xyz/resource-metadata v0.26.1
27932793
## explicit; go 1.23.0
27942794
kmodules.xyz/resource-metadata/apis/core/install
27952795
kmodules.xyz/resource-metadata/apis/core/v1alpha1
@@ -2879,10 +2879,10 @@ kubeops.dev/sidekick/crds
28792879
# kubepack.dev/kubepack v0.29.2-0.20250315012528-cd494afd0133
28802880
## explicit; go 1.23.0
28812881
kubepack.dev/kubepack/pkg/lib
2882-
# kubepack.dev/lib-app v0.3.1-0.20250315014402-772d33228d34
2883-
## explicit; go 1.23.0
2882+
# kubepack.dev/lib-app v0.3.0
2883+
## explicit; go 1.22.7
28842884
kubepack.dev/lib-app/pkg/editor
2885-
# kubepack.dev/lib-helm v0.29.16-0.20250315011604-b842237ac5b2
2885+
# kubepack.dev/lib-helm v0.32.0
28862886
## explicit; go 1.23.0
28872887
kubepack.dev/lib-helm/pkg/action
28882888
kubepack.dev/lib-helm/pkg/chart

0 commit comments

Comments
 (0)