Skip to content

Commit

Permalink
only update builtin fn which refers to the previous latest version (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
yuwenma committed May 7, 2022
1 parent db672f7 commit a804b39
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 41 deletions.
8 changes: 4 additions & 4 deletions porch/deployments/porch/2-function-runner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ metadata:
namespace: porch-system
data:
pod-cache-config.yaml: |
gcr.io/kpt-fn/apply-replacements:v0.1.0: 30m
gcr.io/kpt-fn/apply-replacements:v0.1.1: 30m
gcr.io/kpt-fn/apply-setters:v0.2.0: 30m
gcr.io/kpt-fn/create-setters:v0.1.0: 30m
gcr.io/kpt-fn/ensure-name-substring:v0.2.0: 30m
Expand All @@ -99,10 +99,10 @@ data:
gcr.io/kpt-fn/search-replace:v0.2.0: 30m
gcr.io/kpt-fn/set-annotations:v0.1.4: 30m
gcr.io/kpt-fn/set-enforcement-action:v0.1.0: 30m
gcr.io/kpt-fn/set-image:v0.1.0: 30m
gcr.io/kpt-fn/set-image:v0.1.1: 30m
gcr.io/kpt-fn/set-labels:v0.1.5: 30m
gcr.io/kpt-fn/set-namespace:v0.3.4: 30m
gcr.io/kpt-fn/starlark:v0.4.2: 30m
gcr.io/kpt-fn/set-namespace:v0.4.1: 30m
gcr.io/kpt-fn/starlark:v0.4.3: 30m
gcr.io/kpt-fn/upsert-resource:v0.2.0: 30m
gcr.io/kpt-fn/enable-gcp-services:v0.1.0: 30m
gcr.io/kpt-fn/export-terraform:v0.1.0: 30m
Expand Down
14 changes: 7 additions & 7 deletions porch/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ replace (
require (
cloud.google.com/go/container v1.2.0
github.com/GoogleContainerTools/kpt v0.0.0-00010101000000-000000000000
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-replacements v0.1.0
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-replacements v0.1.1
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-setters v0.2.0
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-namespace v0.3.4
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/starlark v0.4.2
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220412175831-2afd3aec6b69
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-namespace v0.4.1
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/starlark v0.4.3
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54
github.com/GoogleContainerTools/kpt/porch/api v0.0.0-20220426215627-4db5feb3a360
github.com/bluekeyes/go-gitdiff v0.6.1
github.com/go-git/go-billy/v5 v5.3.1
Expand Down Expand Up @@ -100,7 +100,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic v0.6.8 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand Down Expand Up @@ -162,7 +162,7 @@ require (
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
Expand All @@ -177,7 +177,7 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.24.0 // indirect
k8s.io/cli-runtime v0.24.0 // indirect
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
k8s.io/kubectl v0.24.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
sigs.k8s.io/cli-utils v0.29.4 // indirect
Expand Down
29 changes: 14 additions & 15 deletions porch/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,16 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-replacements v0.1.0 h1:SDphME29afeyPd8fLyfW7fJkzSyaY4pw8oRsNmXyJA4=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-replacements v0.1.0/go.mod h1:IjcT3uZoLxGD4Czp4uxUhc++KLBHsX6JoZL7R5kSOYY=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-replacements v0.1.1 h1:fg4LOWPoFYsMzV6h29la7egu4LSAWgJjHN1dkSdmx/A=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-replacements v0.1.1/go.mod h1:8xnZ/1TxSoomhm/jqWHX9BIBhFUuRWifmmz469dcox0=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-setters v0.2.0 h1:GhM9JLR+vW4/jPuL7bGVAEUsIIp5xhJKhm17wSyQZLY=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/apply-setters v0.2.0/go.mod h1:D+1CuvT4BecI7ZokGUVPdjnhT+z0z1/9NB6HGH4cTSI=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-namespace v0.3.4 h1:V5sTd8pln1mL9SHeGyC4x9uP2AL4y+N+pnjEh20EE7M=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-namespace v0.3.4/go.mod h1:es9oqMBPDWJOgjigRvOiqHxbQd37+ibLnoLBg1dVrIg=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/starlark v0.4.2 h1:xwyMfOLoqV48y9B6kDYIg98OI4u2VC/hcPyTyN+piy4=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/starlark v0.4.2/go.mod h1:T7YXoIrhculP6vKqZ4ec9TT4q3e1ZveySWAYJFCd6Bs=
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220329070820-f687d1b931e6/go.mod h1:hENpuHQH/bIfHUCuG4hvzb5i4doJ1KTId5EdWBg6AvU=
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220412175831-2afd3aec6b69 h1:PN0g/pvOy/qmgi9a7qWMgMKteLBo615U+doZT6G+fuE=
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220412175831-2afd3aec6b69/go.mod h1:hENpuHQH/bIfHUCuG4hvzb5i4doJ1KTId5EdWBg6AvU=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-namespace v0.4.1 h1:4/PW8UQST7f6oBIA+vEOHeFFQYkX+FOWYwQyS7lZAVI=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-namespace v0.4.1/go.mod h1:5XWywBvOyBmuIoD9waCvtL2jXaZBYAY6QH+s9UunlVY=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/starlark v0.4.3 h1:fipXlh4qYf5vkpUEA8wmK6YLIC1mgPMsHUpF7gIYamU=
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/starlark v0.4.3/go.mod h1:V11NRqrqOFy43O35azz012xtNBU/px2b8qclZn3Ohpg=
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54 h1:z5iYiugZJiTzQ6ggU0Cae/T+LkrDwcqZyebh8SbmQ0E=
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220506190241-f85503febd54/go.mod h1:vl3iiwgrqdDgvGi5ckt3O9IoyaHUgFkfxE4RjQIqgwk=
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
Expand Down Expand Up @@ -528,8 +527,8 @@ github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSx
github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w=
github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA=
github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
github.com/google/gnostic v0.6.8 h1:bT56GPYBWh1tvBuBEd94qcS3+60b+y0HQur0ITkGuCk=
github.com/google/gnostic v0.6.8/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
Expand Down Expand Up @@ -1255,8 +1254,8 @@ golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -1804,8 +1803,9 @@ k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAG
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk=
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 h1:nqYOUleKLC/0P1zbU29F5q6aoezM6MOAVz+iyfQbZ5M=
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661/go.mod h1:daOouuuwd9JXpv1L7Y34iV3yf6nxzipkKMWWlqlvK9M=
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 h1:nBQrWPlrNIiw0BsX6a6MKr1itkm0ZS0Nl97kNLitFfI=
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6/go.mod h1:daOouuuwd9JXpv1L7Y34iV3yf6nxzipkKMWWlqlvK9M=
k8s.io/kubectl v0.23.2/go.mod h1:zWm5wt8PdRmHiVhE9a7q7XYW4WFX9StkZGnC18+1v3M=
k8s.io/kubectl v0.24.0 h1:nA+WtMLVdXUs4wLogGd1mPTAesnLdBpCVgCmz3I7dXo=
k8s.io/kubectl v0.24.0/go.mod h1:pdXkmCyHiRTqjYfyUJiXtbVNURhv0/Q1TyRhy2d5ic0=
Expand Down Expand Up @@ -1844,7 +1844,6 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLja
sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg=
sigs.k8s.io/kustomize/kyaml v0.10.21/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c=
sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E=
sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc=
sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg=
sigs.k8s.io/kustomize/kyaml v0.13.7-0.20220418212550-9d5491c2e20c h1:Y0cW/MVbKH9jRlMbpLe/4gs2m6qteP1pUGP+JkWcGdA=
sigs.k8s.io/kustomize/kyaml v0.13.7-0.20220418212550-9d5491c2e20c/go.mod h1:6K+IUOuir3Y7nucPRAjw9yth04KSWBnP5pqUTGwj/qU=
Expand Down
14 changes: 7 additions & 7 deletions porch/pkg/engine/builtinruntime.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ import (

var (
applyReplacementsImageAliases = []string{
"gcr.io/kpt-fn/apply-replacements:v0.1.0",
"gcr.io/kpt-fn/apply-replacements:v0.1.1",
"gcr.io/kpt-fn/apply-replacements:v0.1",
"gcr.io/kpt-fn/apply-replacements@sha256:40d00367d46c04088d68ebd05649e1bff6ea43be3a2d3f4d257eef18c4d70f8c",
"gcr.io/kpt-fn/apply-replacements@sha256:85913d4ec8db62053eb060ff1b7e26d13ff8853b75cae4d0461b8a1c7ddd4947",
}
setNamespaceImageAliases = []string{
"gcr.io/kpt-fn/set-namespace:v0.3.4",
"gcr.io/kpt-fn/set-namespace:v0.3",
"gcr.io/kpt-fn/set-namespace@sha256:0ec0fb2380be42142a87a7c9815f0d30415e2da07468591dd9345c7c81d6c93e",
"gcr.io/kpt-fn/set-namespace:v0.4.1",
"gcr.io/kpt-fn/set-namespace:v0.4",
"gcr.io/kpt-fn/set-namespace@sha256:f930d9248001fa763799cc81cf2d89bbf83954fc65de0db20ab038a21784f323",
}
starlarkImageAliases = []string{
"gcr.io/kpt-fn/starlark:v0.4.2",
"gcr.io/kpt-fn/starlark:v0.4.3",
"gcr.io/kpt-fn/starlark:v0.4",
"gcr.io/kpt-fn/starlark@sha256:96ad5c6a7c5099adf1a74173b75558dc4192a1de9c77c3b6e24b8f269807bf6b",
"gcr.io/kpt-fn/starlark@sha256:6ba3971c64abcd6c3d93039d45721bb5ab496c7fbbc9ac1e685b11577f368ce0",
}
)

Expand Down
6 changes: 3 additions & 3 deletions porch/pkg/kpt/fs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ metadata:
name: app
pipeline:
mutators:
- image: gcr.io/kpt-fn/set-namespace:v0.2.0
- image: gcr.io/kpt-fn/set-namespace:v0.4.1
configMap:
namespace: staging
- image: gcr.io/kpt-fn/set-labels:v0.1.5
Expand Down Expand Up @@ -140,7 +140,7 @@ metadata:
name: app-with-db
pipeline:
mutators:
- image: gcr.io/kpt-fn/set-namespace:v0.2.0
- image: gcr.io/kpt-fn/set-namespace:v0.4.1
configMap:
namespace: staging
- image: gcr.io/kpt-fn/set-labels:v0.1.5
Expand All @@ -159,7 +159,7 @@ metadata:
name: db
pipeline:
mutators:
- image: gcr.io/kpt-fn/set-namespace:v0.2.0
- image: gcr.io/kpt-fn/set-namespace:v0.4.1
configMap:
namespace: db
- image: gcr.io/kpt-fn/set-labels:v0.1.5
Expand Down
2 changes: 1 addition & 1 deletion porch/pkg/kpt/internal/functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
var functions map[string]framework.ResourceListProcessorFunc = map[string]framework.ResourceListProcessorFunc{
"gcr.io/kpt-fn/apply-setters:v0.2.0": applySetters,
"gcr.io/kpt-fn/set-labels:v0.1.5": setLabels,
"gcr.io/kpt-fn/set-namespace:v0.2.0": setNamespace,
"gcr.io/kpt-fn/set-namespace:v0.4.1": setNamespace,
}

func FindProcessor(image string) framework.ResourceListProcessorFunc {
Expand Down
4 changes: 2 additions & 2 deletions porch/scripts/create-deployment-blueprint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function customize-image {
local TAG="${NEW##*:}"
local IMG="${NEW%:*}"

kpt fn eval "${DESTINATION}" --image set-image:v0.1.0 -- \
kpt fn eval "${DESTINATION}" --image set-image:v0.1.1 -- \
"name=${OLD}" \
"newName=${IMG}" \
"newTag=${TAG}"
Expand Down Expand Up @@ -151,7 +151,7 @@ EOF

trap "rm -f ${FN_CONFIG}" EXIT

kpt fn eval "${DESTINATION}" --image set-image:v0.1.0 --fn-config "${FN_CONFIG}" || echo "kpt fn eval failed"
kpt fn eval "${DESTINATION}" --image set-image:v0.1.1 --fn-config "${FN_CONFIG}" || echo "kpt fn eval failed"
}

function customize-sa {
Expand Down
4 changes: 2 additions & 2 deletions porch/test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (t *PorchSuite) TestGitRepository(ctx context.Context) {
{
Type: "eval",
Eval: &porchapi.FunctionEvalTaskSpec{
Image: "gcr.io/kpt-fn/set-namespace:v0.2.0",
Image: "gcr.io/kpt-fn/set-namespace:v0.4.1",
ConfigMap: map[string]string{
"namespace": "bucket-namespace",
},
Expand Down Expand Up @@ -844,7 +844,7 @@ func (t *PorchSuite) TestBuiltinFunctionEvaluator(ctx context.Context) {
{
Type: "eval",
Eval: &porchapi.FunctionEvalTaskSpec{
Image: "gcr.io/kpt-fn/set-namespace:v0.3.4",
Image: "gcr.io/kpt-fn/set-namespace:v0.4.1",
ConfigMap: map[string]string{
"namespace": "bucket-namespace",
},
Expand Down

0 comments on commit a804b39

Please sign in to comment.