Merge branch 'main' into sync

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

CONTRIBUTING.md

@@ -387,8 +387,8 @@ debug the plugin.
 
 ## Preview documentation
 
-We use [Hugo](gohugo.io) to build our documentation site, and it is hosted on
-[Netlify](netlify.com). You don't have to install Hugo locally because the
+We use [Hugo](https://gohugo.io) to build our documentation site, and it is hosted on
+[Netlify](https://netlify.com). You don't have to install Hugo locally because the
 preview happens inside a docker container.
 
 1. Run `mage DocsPreview` to start serving the docs. It will watch the file

build/testdata/bundles/mysql/.cnab/bundle.json

@@ -1 +1 @@
-{"actions":{"ping":{"description":"ping","modifies":true}},"credentials":{"kubeconfig":{"path":"/root/.kube/config","required":true}},"custom":{"sh.porter":{"manifest":"bWl4aW5zOgotIGV4ZWMKLSBoZWxtOgogICAgcmVwb3NpdG9yaWVzOgogICAgICBiaXRuYW1pOgogICAgICAgIHVybDogImh0dHBzOi8vY2hhcnRzLmJpdG5hbWkuY29tL2JpdG5hbWkiCgpuYW1lOiBteXNxbAp2ZXJzaW9uOiAiMC4xLjMiCnJlZ2lzdHJ5OiAibG9jYWxob3N0OjUwMDAiCgpjcmVkZW50aWFsczoKLSBuYW1lOiBrdWJlY29uZmlnCiAgcGF0aDogL3Jvb3QvLmt1YmUvY29uZmlnCgpwYXJhbWV0ZXJzOgotIG5hbWU6IGRhdGFiYXNlLW5hbWUKICB0eXBlOiBzdHJpbmcKICBkZWZhdWx0OiBteWRiCiAgZW52OiBEQVRBQkFTRV9OQU1FCi0gbmFtZTogbXlzcWwtdXNlcgogIHR5cGU6IHN0cmluZwogIGRlZmF1bHQ6IG15c3FsLWFkbWluCiAgZW52OiBNWVNRTF9VU0VSCi0gbmFtZTogbmFtZXNwYWNlCiAgdHlwZTogc3RyaW5nCiAgZGVmYXVsdDogJycKLSBuYW1lOiBteXNxbC1uYW1lCiAgdHlwZTogc3RyaW5nCiAgZGVmYXVsdDogcG9ydGVyLWNpLW15c3FsCgppbnN0YWxsOgotIGhlbG06CiAgICBkZXNjcmlwdGlvbjogIkluc3RhbGwgTXlTUUwiCiAgICBuYW1lOiAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtbmFtZSB9fSIKICAgIGNoYXJ0OiBiaXRuYW1pL215c3FsCiAgICB2ZXJzaW9uOiA2LjE0LjEyCiAgICBuYW1lc3BhY2U6ICJ7eyBidW5kbGUucGFyYW1ldGVycy5uYW1lc3BhY2UgfX0iCiAgICByZXBsYWNlOiB0cnVlCiAgICBzZXQ6CiAgICAgIGRiLm5hbWU6ICJ7eyBidW5kbGUucGFyYW1ldGVycy5kYXRhYmFzZS1uYW1lfX0iCiAgICAgIGRiLnVzZXI6ICJ7eyBidW5kbGUucGFyYW1ldGVycy5teXNxbC11c2VyIH19IgogICAgb3V0cHV0czoKICAgIC0gbmFtZTogbXlzcWwtcm9vdC1wYXNzd29yZAogICAgICBzZWNyZXQ6ICJ7eyBidW5kbGUucGFyYW1ldGVycy5teXNxbC1uYW1lIH19IgogICAgICBrZXk6IG15c3FsLXJvb3QtcGFzc3dvcmQKICAgIC0gbmFtZTogbXlzcWwtcGFzc3dvcmQKICAgICAgc2VjcmV0OiAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtbmFtZSB9fSIKICAgICAga2V5OiBteXNxbC1wYXNzd29yZAoKcGluZzoKICAtIGV4ZWM6CiAgICAgIGRlc2NyaXB0aW9uOiAiUGluZyIKICAgICAgY29tbWFuZDogLi9oZWxwZXJzLnNoCiAgICAgIGFyZ3VtZW50czoKICAgICAgICAtIHBpbmcKCnVwZ3JhZGU6CiAgLSBoZWxtOgogICAgICBkZXNjcmlwdGlvbjogIlVwZ3JhZGUgTXlTUUwiCiAgICAgIG5hbWU6ICJ7eyBidW5kbGUucGFyYW1ldGVycy5teXNxbC1uYW1lIH19IgogICAgICBuYW1lc3BhY2U6ICJ7eyBidW5kbGUucGFyYW1ldGVycy5uYW1lc3BhY2UgfX0iCiAgICAgIGNoYXJ0OiBiaXRuYW1pL215c3FsCiAgICAgIHZlcnNpb246IDYuMTQuMTIKICAgICAgb3V0cHV0czoKICAgICAgLSBuYW1lOiBteXNxbC1yb290LXBhc3N3b3JkCiAgICAgICAgc2VjcmV0OiAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtbmFtZSB9fSIKICAgICAgICBrZXk6IG15c3FsLXJvb3QtcGFzc3dvcmQKICAgICAgLSBuYW1lOiBteXNxbC1wYXNzd29yZAogICAgICAgIHNlY3JldDogInt7IGJ1bmRsZS5wYXJhbWV0ZXJzLm15c3FsLW5hbWUgfX0iCiAgICAgICAga2V5OiBteXNxbC1wYXNzd29yZAoKdW5pbnN0YWxsOgotIGhlbG06CiAgICBkZXNjcmlwdGlvbjogIlVuaW5zdGFsbCBNeVNRTCIKICAgIHB1cmdlOiB0cnVlCiAgICByZWxlYXNlczoKICAgICAgLSAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtbmFtZSB9fSIKCm91dHB1dHM6CiAgLSBuYW1lOiBteXNxbC1wYXNzd29yZAogICAgZGVzY3JpcHRpb246ICJUaGUgbXlzcWwgZGF0YWJhc2UgcGFzc3dvcmQiCiAgICB0eXBlOiBzdHJpbmcKICAgIGRlZmF1bHQ6ICJkZWZhdWx0LXBhc3N3b3JkIgogICAgYXBwbHlUbzoKICAgICAgLSBpbnN0YWxsCiAgICAgIC0gdXBncmFkZQogICAgc2Vuc2l0aXZlOiB0cnVlCiAgLSBuYW1lOiBteXNxbC1yb290LXBhc3N3b3JkCiAgICBkZXNjcmlwdGlvbjogIlRoZSBteXNxbCByb290IHVzZXIgcGFzc3dvcmQiCiAgICBkZWZhdWx0OiAiZGVmYXVsdC1yb290LXBhc3N3b3JkIgogICAgdHlwZTogc3RyaW5nCiAgICBhcHBseVRvOgogICAgICAtIGluc3RhbGwKICAgICAgLSB1cGdyYWRlCiAgICBzZW5zaXRpdmU6IHRydWUK","manifestDigest":"4708ed95fbc0ad39168a3d10206339f2e0aff943923402f9697365db7ae1b9e9","mixins":{"exec":{},"helm":{}}}},"definitions":{"database-name-parameter":{"default":"mydb","type":"string"},"mysql-name-parameter":{"default":"porter-ci-mysql","type":"string"},"mysql-password-output":{"default":"default-password","description":"The mysql database password","type":"string","writeOnly":true},"mysql-root-password-output":{"default":"default-root-password","description":"The mysql root user password","type":"string","writeOnly":true},"mysql-user-parameter":{"default":"mysql-admin","type":"string"},"namespace-parameter":{"default":"","type":"string"},"porter-debug-parameter":{"$comment":"porter-internal","$id":"https://porter.sh/generated-bundle/#porter-debug","default":false,"description":"Print debug information from Porter when executing the bundle","type":"boolean"}},"description":"","invocationImages":[{"image":"localhost:5000/mysql-installer:v0.1.3","imageType":"docker"}],"name":"mysql","outputs":{"mysql-password":{"applyTo":["install","upgrade"],"definition":"mysql-password-output","description":"The mysql database password","path":"/cnab/app/outputs/mysql-password"},"mysql-root-password":{"applyTo":["install","upgrade"],"definition":"mysql-root-password-output","description":"The mysql root user password","path":"/cnab/app/outputs/mysql-root-password"}},"parameters":{"database-name":{"definition":"database-name-parameter","destination":{"env":"DATABASE_NAME"}},"mysql-name":{"definition":"mysql-name-parameter","destination":{"env":"MYSQL_NAME"}},"mysql-user":{"definition":"mysql-user-parameter","destination":{"env":"MYSQL_USER"}},"namespace":{"definition":"namespace-parameter","destination":{"env":"NAMESPACE"}},"porter-debug":{"definition":"porter-debug-parameter","description":"Print debug information from Porter when executing the bundle","destination":{"env":"PORTER_DEBUG"}}},"schemaVersion":"v1.0.0","version":"0.1.3"}
+{"actions":{"ping":{"description":"ping","modifies":true}},"credentials":{"kubeconfig":{"path":"/root/.kube/config","required":true}},"custom":{"sh.porter":{"commit":"43d077da","manifest":"bWl4aW5zOgotIGV4ZWMKLSBoZWxtMzoKICAgIHJlcG9zaXRvcmllczoKICAgICAgYml0bmFtaToKICAgICAgICB1cmw6ICJodHRwczovL2NoYXJ0cy5iaXRuYW1pLmNvbS9iaXRuYW1pIgoKbmFtZTogbXlzcWwKdmVyc2lvbjogIjAuMS40IgpyZWdpc3RyeTogImxvY2FsaG9zdDo1MDAwIgoKY3JlZGVudGlhbHM6Ci0gbmFtZToga3ViZWNvbmZpZwogIHBhdGg6IC9yb290Ly5rdWJlL2NvbmZpZwoKcGFyYW1ldGVyczoKLSBuYW1lOiBkYXRhYmFzZS1uYW1lCiAgdHlwZTogc3RyaW5nCiAgZGVmYXVsdDogbXlkYgogIGVudjogREFUQUJBU0VfTkFNRQotIG5hbWU6IG15c3FsLXVzZXIKICB0eXBlOiBzdHJpbmcKICBkZWZhdWx0OiBteXNxbC1hZG1pbgogIGVudjogTVlTUUxfVVNFUgotIG5hbWU6IG5hbWVzcGFjZQogIHR5cGU6IHN0cmluZwogIGRlZmF1bHQ6ICdteXNxbCcKLSBuYW1lOiBteXNxbC1uYW1lCiAgdHlwZTogc3RyaW5nCiAgZGVmYXVsdDogcG9ydGVyLWNpLW15c3FsCgppbnN0YWxsOgotIGhlbG0zOgogICAgZGVzY3JpcHRpb246ICJJbnN0YWxsIE15U1FMIgogICAgbmFtZTogInt7IGJ1bmRsZS5wYXJhbWV0ZXJzLm15c3FsLW5hbWUgfX0iCiAgICBjaGFydDogYml0bmFtaS9teXNxbAogICAgdmVyc2lvbjogNi4xNC4xMgogICAgbmFtZXNwYWNlOiAie3sgYnVuZGxlLnBhcmFtZXRlcnMubmFtZXNwYWNlIH19IgogICAgcmVwbGFjZTogdHJ1ZQogICAgc2V0OgogICAgICBkYi5uYW1lOiAie3sgYnVuZGxlLnBhcmFtZXRlcnMuZGF0YWJhc2UtbmFtZX19IgogICAgICBkYi51c2VyOiAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtdXNlciB9fSIKICAgIG91dHB1dHM6CiAgICAtIG5hbWU6IG15c3FsLXJvb3QtcGFzc3dvcmQKICAgICAgc2VjcmV0OiAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtbmFtZSB9fSIKICAgICAga2V5OiBteXNxbC1yb290LXBhc3N3b3JkCiAgICAtIG5hbWU6IG15c3FsLXBhc3N3b3JkCiAgICAgIHNlY3JldDogInt7IGJ1bmRsZS5wYXJhbWV0ZXJzLm15c3FsLW5hbWUgfX0iCiAgICAgIGtleTogbXlzcWwtcGFzc3dvcmQKCnBpbmc6CiAgLSBleGVjOgogICAgICBkZXNjcmlwdGlvbjogIlBpbmciCiAgICAgIGNvbW1hbmQ6IC4vaGVscGVycy5zaAogICAgICBhcmd1bWVudHM6CiAgICAgICAgLSBwaW5nCgp1cGdyYWRlOgogIC0gaGVsbTM6CiAgICAgIGRlc2NyaXB0aW9uOiAiVXBncmFkZSBNeVNRTCIKICAgICAgbmFtZTogInt7IGJ1bmRsZS5wYXJhbWV0ZXJzLm15c3FsLW5hbWUgfX0iCiAgICAgIG5hbWVzcGFjZTogInt7IGJ1bmRsZS5wYXJhbWV0ZXJzLm5hbWVzcGFjZSB9fSIKICAgICAgY2hhcnQ6IGJpdG5hbWkvbXlzcWwKICAgICAgdmVyc2lvbjogNi4xNC4xMgogICAgICBvdXRwdXRzOgogICAgICAtIG5hbWU6IG15c3FsLXJvb3QtcGFzc3dvcmQKICAgICAgICBzZWNyZXQ6ICJ7eyBidW5kbGUucGFyYW1ldGVycy5teXNxbC1uYW1lIH19IgogICAgICAgIGtleTogbXlzcWwtcm9vdC1wYXNzd29yZAogICAgICAtIG5hbWU6IG15c3FsLXBhc3N3b3JkCiAgICAgICAgc2VjcmV0OiAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtbmFtZSB9fSIKICAgICAgICBrZXk6IG15c3FsLXBhc3N3b3JkCgp1bmluc3RhbGw6Ci0gaGVsbTM6CiAgICBkZXNjcmlwdGlvbjogIlVuaW5zdGFsbCBNeVNRTCIKICAgIHB1cmdlOiB0cnVlCiAgICByZWxlYXNlczoKICAgICAgLSAie3sgYnVuZGxlLnBhcmFtZXRlcnMubXlzcWwtbmFtZSB9fSIKCm91dHB1dHM6CiAgLSBuYW1lOiBteXNxbC1wYXNzd29yZAogICAgZGVzY3JpcHRpb246ICJUaGUgbXlzcWwgZGF0YWJhc2UgcGFzc3dvcmQiCiAgICB0eXBlOiBzdHJpbmcKICAgIGRlZmF1bHQ6ICJkZWZhdWx0LXBhc3N3b3JkIgogICAgYXBwbHlUbzoKICAgICAgLSBpbnN0YWxsCiAgICAgIC0gdXBncmFkZQogICAgc2Vuc2l0aXZlOiB0cnVlCiAgLSBuYW1lOiBteXNxbC1yb290LXBhc3N3b3JkCiAgICBkZXNjcmlwdGlvbjogIlRoZSBteXNxbCByb290IHVzZXIgcGFzc3dvcmQiCiAgICBkZWZhdWx0OiAiZGVmYXVsdC1yb290LXBhc3N3b3JkIgogICAgdHlwZTogc3RyaW5nCiAgICBhcHBseVRvOgogICAgICAtIGluc3RhbGwKICAgICAgLSB1cGdyYWRlCiAgICBzZW5zaXRpdmU6IHRydWUK","manifestDigest":"44f4b4714d3a2ac978803ab19137b859350b30e1f06013a30a5ba65d422e6c19","mixins":{"exec":{},"helm3":{}},"version":"v0.38.6"},"sh.porter.file-parameters":{}},"definitions":{"database-name-parameter":{"default":"mydb","type":"string"},"mysql-name-parameter":{"default":"porter-ci-mysql","type":"string"},"mysql-password-output":{"default":"default-password","description":"The mysql database password","type":"string","writeOnly":true},"mysql-root-password-output":{"default":"default-root-password","description":"The mysql root user password","type":"string","writeOnly":true},"mysql-user-parameter":{"default":"mysql-admin","type":"string"},"namespace-parameter":{"default":"mysql","type":"string"},"porter-debug-parameter":{"$comment":"porter-internal","$id":"https://porter.sh/generated-bundle/#porter-debug","default":false,"description":"Print debug information from Porter when executing the bundle","type":"boolean"}},"description":"","invocationImages":[{"image":"localhost:5000/mysql-installer:v0.1.4","imageType":"docker"}],"name":"mysql","outputs":{"mysql-password":{"applyTo":["install","upgrade"],"definition":"mysql-password-output","description":"The mysql database password","path":"/cnab/app/outputs/mysql-password"},"mysql-root-password":{"applyTo":["install","upgrade"],"definition":"mysql-root-password-output","description":"The mysql root user password","path":"/cnab/app/outputs/mysql-root-password"}},"parameters":{"database-name":{"definition":"database-name-parameter","destination":{"env":"DATABASE_NAME"}},"mysql-name":{"definition":"mysql-name-parameter","destination":{"env":"MYSQL_NAME"}},"mysql-user":{"definition":"mysql-user-parameter","destination":{"env":"MYSQL_USER"}},"namespace":{"definition":"namespace-parameter","destination":{"env":"NAMESPACE"}},"porter-debug":{"definition":"porter-debug-parameter","description":"Print debug information from Porter when executing the bundle","destination":{"env":"PORTER_DEBUG"}}},"requiredExtensions":["sh.porter.file-parameters"],"schemaVersion":"v1.0.0","version":"0.1.4"}

build/testdata/bundles/mysql/porter.yaml

@@ -1,6 +1,6 @@
 mixins:
 - exec
-- helm:
+- helm3:
     repositories:
       bitnami:
         url: "https://charts.bitnami.com/bitnami"
@@ -24,13 +24,17 @@ parameters:
   env: MYSQL_USER
 - name: namespace
   type: string
-  default: ''
+  default: 'mysql'
 - name: mysql-name
   type: string
   default: porter-ci-mysql
+- name: probe-timeout
+  description: Timeout for liveness and readiness probes
+  type: integer
+  default: 1
 
 install:
-- helm:
+- helm3:
     description: "Install MySQL"
     name: "{{ bundle.parameters.mysql-name }}"
     chart: bitnami/mysql
@@ -40,6 +44,8 @@ install:
     set:
       db.name: "{{ bundle.parameters.database-name}}"
       db.user: "{{ bundle.parameters.mysql-user }}"
+      primary.readinessProbe.timeout: "{{ bundle.parameters.probe-timeout}}"
+      primary.livenessProbe.timeout: "{{ bundle.parameters.probe-timeout}}"
     outputs:
     - name: mysql-root-password
       secret: "{{ bundle.parameters.mysql-name }}"
@@ -56,7 +62,7 @@ ping:
         - ping
 
 upgrade:
-  - helm:
+  - helm3:
       description: "Upgrade MySQL"
       name: "{{ bundle.parameters.mysql-name }}"
       namespace: "{{ bundle.parameters.namespace }}"
@@ -71,7 +77,7 @@ upgrade:
         key: mysql-password
 
 uninstall:
-- helm:
+- helm3:
     description: "Uninstall MySQL"
     purge: true
     releases: