Skip to content

Commit

Permalink
fix: image ref resolver error (#41)
Browse files Browse the repository at this point in the history
  • Loading branch information
hysyeah authored Jul 19, 2024
1 parent 44dafe5 commit 52cd37b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
6 changes: 6 additions & 0 deletions pkg/sandbox/sidecar/envoy.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ func getEnvoyConfigOnlyForOutBound(appcfg *appinstaller.ApplicationConfig, perms
ClusterSpecifier: &routev3.RouteAction_Cluster{
Cluster: "original_dst",
},
Timeout: &duration.Duration{
Seconds: 180,
},
},
},
},
Expand Down Expand Up @@ -1147,6 +1150,9 @@ func (ec *envoyConfig) WithProxyOutBound(appcfg *appinstaller.ApplicationConfig,
Cluster: "system-server",
},
PrefixRewrite: "/system-server/v2/" + r.dataType + "/" + r.group + "/" + r.version + "/",
Timeout: &duration.Duration{
Seconds: 180,
},
},
},
RequestHeadersToAdd: []*corev3.HeaderValueOption{
Expand Down
10 changes: 7 additions & 3 deletions pkg/utils/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,13 @@ func GetRefFromResourceList(chartPath string) (refs []string, err error) {
filteredRefs := make([]string, 0)
for _, ref := range refs {
if _, ok := seen[ref]; !ok {
named, _ := refdocker.ParseDockerRef(ref)
filteredRefs = append(filteredRefs, named.String())
seen[named.String()] = struct{}{}
named, err := refdocker.ParseDockerRef(ref)
namedRef := ref
if err == nil {
namedRef = named.String()
}
filteredRefs = append(filteredRefs, namedRef)
seen[namedRef] = struct{}{}
}
}
return filteredRefs, nil
Expand Down

0 comments on commit 52cd37b

Please sign in to comment.