Skip to content

Commit 51af1b6

Browse files
committed
Use ui-server pod namespace incase srcref ns is undefined
Signed-off-by: Tamal Saha <[email protected]>
1 parent 8421d96 commit 51af1b6

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
kmodules.xyz/client-go v0.25.6
3434
kmodules.xyz/custom-resources v0.25.0
3535
kmodules.xyz/monitoring-agent-api v0.25.0
36-
kmodules.xyz/resource-metadata v0.14.1-0.20221025084116-2fea5d4005c8
36+
kmodules.xyz/resource-metadata v0.14.1-0.20221026061352-d80461714483
3737
kmodules.xyz/resource-metrics v0.25.0
3838
kmodules.xyz/sets v0.24.0
3939
kubepack.dev/lib-helm v0.5.7-0.20221024120504-d029626cf65b

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1189,8 +1189,8 @@ kmodules.xyz/monitoring-agent-api v0.25.0 h1:RU9RBeCqQdoS381xXy8cM1aqT+7qmtuPI3K
11891189
kmodules.xyz/monitoring-agent-api v0.25.0/go.mod h1:RH5f/W9eCiW+KTblBIh8MZkjCWdtMQ8MuzCBMfgkynM=
11901190
kmodules.xyz/offshoot-api v0.25.0 h1:Svq9da/+sg5afOjpgo9vx2J/Lu90Mo0aFxkdQmgKnGI=
11911191
kmodules.xyz/offshoot-api v0.25.0/go.mod h1:ysEBn7LJuT3+s8ynAQA/OG0BSsJugXa6KGtDLMRjlKo=
1192-
kmodules.xyz/resource-metadata v0.14.1-0.20221025084116-2fea5d4005c8 h1:I2dJ1F5KfmzWH2PjhgDACXdTtGH/lh1KdGWVBn4+0Ig=
1193-
kmodules.xyz/resource-metadata v0.14.1-0.20221025084116-2fea5d4005c8/go.mod h1:lQQvuSlkBQ9LICd1m/g9JpIdxCSmI6MUSfjnadtKzwk=
1192+
kmodules.xyz/resource-metadata v0.14.1-0.20221026061352-d80461714483 h1:JkZQBePb6MYc8R8pKaqZM8UdEoRdjvXIBehZL4Aw+X4=
1193+
kmodules.xyz/resource-metadata v0.14.1-0.20221026061352-d80461714483/go.mod h1:lQQvuSlkBQ9LICd1m/g9JpIdxCSmI6MUSfjnadtKzwk=
11941194
kmodules.xyz/resource-metrics v0.25.0 h1:wj3npVZZQr+Yysg/XdGn4LdT5kQizWeO0zq7QlSVx50=
11951195
kmodules.xyz/resource-metrics v0.25.0/go.mod h1:4a49npnu73c9LGDWHWQsPWoXWXU9rpCcknoH1+HHesI=
11961196
kmodules.xyz/sets v0.24.0 h1:GbltLEPVnURjcmWyf8eFstgJBpm9o151wsrABkByGrc=

vendor/kmodules.xyz/resource-metadata/pkg/layouts/lib.go

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"strings"
2323

2424
kmapi "kmodules.xyz/client-go/api/v1"
25+
meta_util "kmodules.xyz/client-go/meta"
2526
"kmodules.xyz/resource-metadata/apis/meta/v1alpha1"
2627
"kmodules.xyz/resource-metadata/apis/shared"
2728
"kmodules.xyz/resource-metadata/hub"
@@ -193,6 +194,9 @@ func GetResourceLayout(kc client.Client, outline *v1alpha1.ResourceOutline) (*v1
193194
if ref == nil {
194195
return nil, nil
195196
}
197+
if ref.SourceRef.Namespace == "" {
198+
ref.SourceRef.Namespace = meta_util.PodNamespace()
199+
}
196200
var src fluxsrc.HelmRepository
197201
err := kc.Get(context.TODO(), client.ObjectKey{Namespace: ref.SourceRef.Namespace, Name: ref.SourceRef.Name}, &src)
198202
if err != nil {

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ kmodules.xyz/monitoring-agent-api/client
13571357
# kmodules.xyz/offshoot-api v0.25.0
13581358
## explicit; go 1.18
13591359
kmodules.xyz/offshoot-api/api/v1
1360-
# kmodules.xyz/resource-metadata v0.14.1-0.20221025084116-2fea5d4005c8
1360+
# kmodules.xyz/resource-metadata v0.14.1-0.20221026061352-d80461714483
13611361
## explicit; go 1.18
13621362
kmodules.xyz/resource-metadata/apis/core/install
13631363
kmodules.xyz/resource-metadata/apis/core/v1alpha1

0 commit comments

Comments
 (0)