Skip to content

Commit 0efa332

Browse files
yuwenmayuwenma
authored
Prepare release candidate for set-namespace/v0.4.1 (#854)
Not to master, to set-namespace/v0.4 branch
1 parent 0678dd6 commit 0efa332

File tree

12 files changed

+117
-113
lines changed

12 files changed

+117
-113
lines changed

‎examples/starlark-validation/.expected/results.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
12
apiVersion: kpt.dev/v1
23
kind: FunctionResultList
34
metadata:
45
name: fnresults
56
exitCode: 1
67
items:
78
- image: gcr.io/kpt-fn/starlark:unstable
9+
stderr: 'failed to evaluate function: error: function failure'
810
exitCode: 1
911
results:
1012
- message: 'fail: it is prohibited to have private key in a configmap'

‎functions/go/apply-replacements/go.mod

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,31 @@ module github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-
33
go 1.17
44

55
require (
6-
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220329070820-f687d1b931e6
6+
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54
77
sigs.k8s.io/kustomize/api v0.10.1
8-
sigs.k8s.io/kustomize/kyaml v0.13.3
8+
sigs.k8s.io/kustomize/kyaml v0.13.6
99
)
1010

1111
require (
12-
github.com/PuerkitoBio/purell v1.1.1 // indirect
13-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
1412
github.com/davecgh/go-spew v1.1.1 // indirect
1513
github.com/go-errors/errors v1.4.2 // indirect
16-
github.com/go-logr/logr v1.2.0 // indirect
14+
github.com/go-logr/logr v1.2.3 // indirect
1715
github.com/go-openapi/jsonpointer v0.19.5 // indirect
18-
github.com/go-openapi/jsonreference v0.19.6 // indirect
16+
github.com/go-openapi/jsonreference v0.20.0 // indirect
1917
github.com/go-openapi/swag v0.21.1 // indirect
20-
github.com/googleapis/gnostic v0.5.5 // indirect
18+
github.com/golang/protobuf v1.5.2 // indirect
19+
github.com/google/gnostic v0.6.9 // indirect
2120
github.com/josharian/intern v1.0.0 // indirect
2221
github.com/mailru/easyjson v0.7.7 // indirect
2322
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
2423
github.com/pkg/errors v0.9.1 // indirect
2524
github.com/pmezard/go-difflib v1.0.0 // indirect
2625
github.com/stretchr/testify v1.7.1 // indirect
2726
github.com/xlab/treeprint v1.1.0 // indirect
28-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
29-
golang.org/x/text v0.3.7 // indirect
27+
google.golang.org/protobuf v1.28.0 // indirect
3028
gopkg.in/yaml.v2 v2.4.0 // indirect
3129
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
32-
k8s.io/klog/v2 v2.30.0 // indirect
33-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
30+
k8s.io/klog/v2 v2.60.1 // indirect
31+
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
3432
sigs.k8s.io/yaml v1.2.0 // indirect
3533
)

‎functions/go/apply-replacements/go.sum

Lines changed: 29 additions & 61 deletions
Large diffs are not rendered by default.

‎functions/go/apply-replacements/replacements/replacements.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ type Replacements struct {
2323

2424
// Config initializes Replacements from a functionConfig fn.KubeObject
2525
func (r *Replacements) Config(functionConfig *fn.KubeObject) error {
26+
if functionConfig.IsEmpty() {
27+
return fmt.Errorf("FunctionConfig is missing. Expect `ApplyReplacements`")
28+
}
2629
if functionConfig.GetKind() != fnConfigKind || functionConfig.GetAPIVersion() != fnConfigApiVersion {
2730
return fmt.Errorf("received functionConfig of kind %s and apiVersion %s, "+
2831
"only functionConfig of kind %s and apiVersion %s is supported",

‎functions/go/set-namespace/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-na
22

33
go 1.17
44

5-
require github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220503232936-7ad5b77727ee
5+
require github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54
66

77
require (
88
github.com/davecgh/go-spew v1.1.1 // indirect

‎functions/go/set-namespace/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
3939
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4040
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4141
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
42-
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220503232936-7ad5b77727ee h1:zi0tfHXaBbCWvO785ZGUHkpa3RgKubDhO4NSzDZ1bxw=
43-
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220503232936-7ad5b77727ee/go.mod h1:vl3iiwgrqdDgvGi5ckt3O9IoyaHUgFkfxE4RjQIqgwk=
42+
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54 h1:z5iYiugZJiTzQ6ggU0Cae/T+LkrDwcqZyebh8SbmQ0E=
43+
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54/go.mod h1:vl3iiwgrqdDgvGi5ckt3O9IoyaHUgFkfxE4RjQIqgwk=
4444
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
4545
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
4646
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=

‎functions/go/set-namespace/transformer/namespace.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ func SetNamespace(rl *fn.ResourceList) (bool, error) {
2525
// Get "namespace" arguments from FunctionConfig
2626
err := tc.Config(rl.FunctionConfig)
2727
if err != nil {
28-
rl.Results = append(rl.Results, fn.ErrorConfigObjectResult(err, rl.FunctionConfig))
29-
return true, nil
28+
rl.Results = append(rl.Results, fn.ErrorResult(err))
29+
return false, nil
3030
}
3131
// Update "namespace" to the proper resources.
3232
oldNamespaces := map[string]struct{}{}
@@ -60,6 +60,8 @@ func (p *NamespaceTransformer) LogResults(rl *fn.ResourceList, count int, oldNam
6060
// Config gets the attributes from different FunctionConfig formats.
6161
func (p *NamespaceTransformer) Config(o *fn.KubeObject) error {
6262
switch {
63+
case o.IsEmpty():
64+
return fmt.Errorf("FunctionConfig is missing. Expect `ConfigMap` or `SetNamespace`")
6365
case o.IsGVK("v1", "ConfigMap"):
6466
p.NewNamespace = o.NestedStringOrDie("data", "namespace")
6567
if p.NewNamespace == "" {

‎functions/go/starlark/go.mod

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/starla
33
go 1.17
44

55
require (
6-
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220329070820-f687d1b931e6
6+
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54
77
github.com/qri-io/starlib v0.5.0
8-
github.com/stretchr/testify v1.7.0
8+
github.com/stretchr/testify v1.7.1
99
go.starlark.net v0.0.0-20210901212718-87f333178d59
1010
k8s.io/api v0.23.4
1111
k8s.io/apimachinery v0.23.4
@@ -15,40 +15,39 @@ require (
1515
require (
1616
github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
1717
github.com/PuerkitoBio/goquery v1.5.1 // indirect
18-
github.com/PuerkitoBio/purell v1.1.1 // indirect
19-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2018
github.com/andybalholm/cascadia v1.1.0 // indirect
2119
github.com/davecgh/go-spew v1.1.1 // indirect
2220
github.com/dustmop/soup v1.1.2-0.20190516214245-38228baa104e // indirect
23-
github.com/go-errors/errors v1.0.1 // indirect
24-
github.com/go-logr/logr v1.2.0 // indirect
21+
github.com/go-errors/errors v1.4.2 // indirect
22+
github.com/go-logr/logr v1.2.3 // indirect
2523
github.com/go-openapi/jsonpointer v0.19.5 // indirect
26-
github.com/go-openapi/jsonreference v0.19.3 // indirect
27-
github.com/go-openapi/swag v0.19.5 // indirect
24+
github.com/go-openapi/jsonreference v0.20.0 // indirect
25+
github.com/go-openapi/swag v0.21.1 // indirect
2826
github.com/gogo/protobuf v1.3.2 // indirect
2927
github.com/golang/protobuf v1.5.2 // indirect
30-
github.com/google/gnostic v0.5.7-v3refs // indirect
28+
github.com/google/gnostic v0.6.9 // indirect
3129
github.com/google/go-cmp v0.5.5 // indirect
3230
github.com/google/gofuzz v1.1.0 // indirect
31+
github.com/josharian/intern v1.0.0 // indirect
3332
github.com/json-iterator/go v1.1.12 // indirect
34-
github.com/mailru/easyjson v0.7.0 // indirect
33+
github.com/mailru/easyjson v0.7.7 // indirect
3534
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3635
github.com/modern-go/reflect2 v1.0.2 // indirect
3736
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
3837
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
3938
github.com/paulmach/orb v0.1.5 // indirect
4039
github.com/pkg/errors v0.9.1 // indirect
4140
github.com/pmezard/go-difflib v1.0.0 // indirect
42-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
43-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
44-
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
41+
github.com/xlab/treeprint v1.1.0 // indirect
42+
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
43+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
4544
golang.org/x/text v0.3.7 // indirect
4645
google.golang.org/protobuf v1.28.0 // indirect
4746
gopkg.in/inf.v0 v0.9.1 // indirect
4847
gopkg.in/yaml.v2 v2.4.0 // indirect
4948
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
50-
k8s.io/klog/v2 v2.30.0 // indirect
51-
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
49+
k8s.io/klog/v2 v2.60.1 // indirect
50+
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
5251
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
5352
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
5453
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect

0 commit comments

Comments
 (0)