Merge branch 'carvel-dev:develop' into kapp-docs-faq-immutable

carvel-dev · Sep 12, 2024 · 1e61229 · 1e61229
2 parents 494c8bc + f86e8cc
commit 1e61229
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 33 deletions.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -7,16 +7,19 @@ Maintainers may focus on one or many tools. Some maintainers have different resp
 
 | Maintainer            | GitHub ID                                             | Affiliation                              | Carvel Tool Focus                                                                                                                                                                                                                  |
 |-----------------------|-------------------------------------------------------|------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Dmitriy Kalinin       | [cppforlife](https://github.com/cppforlife)           | [VMware](https://www.github.com/vmware/) | All Tools (Approver)                                                                                                                                                                                                               |
-| João Pereira          | [joaopapereira](https://github.com/joaopapereira)     | [VMware](https://www.github.com/vmware/) | [imgpkg](https://github.com/carvel-dev/imgpkg) (Lead), [kbld](https://github.com/carvel-dev/kbld), [vendir](https://github.com/carvel-dev/vendir) |
+| Dmitriy Kalinin       | [cppforlife](https://github.com/cppforlife)           | [Broadcom](https://www.broadcom.com) | All Tools (Approver)                                                                                                                                                                                                               |
+| João Pereira          | [joaopapereira](https://github.com/joaopapereira)     | [Broadcom](https://www.broadcom.com) | [imgpkg](https://github.com/carvel-dev/imgpkg) (Lead), [kbld](https://github.com/carvel-dev/kbld), [vendir](https://github.com/carvel-dev/vendir) |
 | John Brunton          | [jbrunton](https://github.com/jbrunton)               | [converge.io](https://converge.io/)      | [carvel-setup-action](https://github.com/carvel-dev/setup-action) (Approver) |
-| Kumari Tanushree      | [kumaritanushree](https://github.com/kumaritanushree) | [VMware](https://www.github.com/vmware/) | [vendir](https://github.com/carvel-dev/vendir), [kapp](https://github.com/carvel-dev/kapp) |
-| Praveen Rewar         | [praveenrewar](https://github.com/praveenrewar)       | [VMware](https://www.github.com/vmware/) | [kapp](https://github.com/carvel-dev/kapp) (Approver), [kctrl](https://github.com/carvel-dev/kapp-controller/tree/develop/cli) (Approver), [kapp-controller](https://github.com/carvel-dev/kapp-controller)(Reviewer), [imgpkg](https://github.com/carvel-dev/imgpkg) |
-| Rohit Aggarwal        | [rohitagg2020](https://github.com/rohitagg2020)       | [VMware](https://www.github.com/vmware/) | [kapp](https://github.com/carvel-dev/kapp) (Reviewer), [kctrl](https://github.com/carvel-dev/kapp-controller/tree/develop/cli) (Reviewer), [secretgen-controller](https://github.com/carvel-dev/secretgen-controller) |
-| Soumik Majumder       | [100mik](https://github.com/100mik)                   | [VMware](https://www.github.com/vmware/) | [kapp](https://github.com/carvel-dev/kapp) (Approver), [kctrl](https://github.com/carvel-dev/kapp-controller/tree/develop/cli) (Approver), [ytt](https://github.com/carvel-dev/ytt) |
-| Varsha Munishwar      | [vmunishwar](https://github.com/vmunishwar)           | [VMware](https://www.github.com/vmware/) | [ytt](https://github.com/carvel-dev/ytt), [vendir](https://github.com/carvel-dev/vendir)                                                                                                                                                                                  |
-| Yash Sethiya          | [sethiyash](https://github.com/sethiyash)             | [VMware](https://www.github.com/vmware/) | [ytt](https://github.com/carvel-dev/ytt), [kbld](https://github.com/carvel-dev/kbld)                                                                                                                                                                                |
-| Premkumar Bhaskal     | [prembhaskal](https://github.com/prembhaskal)         | [VMware](https://www.github.com/vmware/) | [ytt](https://github.com/carvel-dev/ytt)                                                                                                                                                                                |
+| Praveen Rewar         | [praveenrewar](https://github.com/praveenrewar)       | [Broadcom](https://www.broadcom.com) | [kapp](https://github.com/carvel-dev/kapp) (Approver), [kctrl](https://github.com/carvel-dev/kapp-controller/tree/develop/cli) (Approver), [kapp-controller](https://github.com/carvel-dev/kapp-controller)(Reviewer), [imgpkg](https://github.com/carvel-dev/imgpkg) |
+| Rohit Aggarwal        | [rohitagg2020](https://github.com/rohitagg2020)       | [Broadcom](https://www.broadcom.com) | [kapp](https://github.com/carvel-dev/kapp) (Reviewer), [kctrl](https://github.com/carvel-dev/kapp-controller/tree/develop/cli) (Reviewer), [secretgen-controller](https://github.com/carvel-dev/secretgen-controller) |
+| Soumik Majumder       | [100mik](https://github.com/100mik)                   | [Broadcom](https://www.broadcom.com) | [kapp](https://github.com/carvel-dev/kapp) (Approver), [kctrl](https://github.com/carvel-dev/kapp-controller/tree/develop/cli) (Approver), [ytt](https://github.com/carvel-dev/ytt) |
+| Premkumar Bhaskal     | [prembhaskal](https://github.com/prembhaskal)         | [Intuit](https://www.intuit.com) | [ytt](https://github.com/carvel-dev/ytt)                                                                                                                                                                                |
+| Thomas Vitale     | [ThomasVitale](https://github.com/ThomasVitale)         | [Systematic](https://systematic.com/en-gb/) | [ytt](https://github.com/carvel-dev/kapp-controller) , Community Champion |
+| German Lashevich     | [Zebradil](https://github.com/Zebradil)         | [Trivago](https://github.com/trivago) | [vendir](https://github.com/carvel-dev/vendir) (Reviewer) |
+| Max Brauer   | [mamachanko](https://github.com/mamachanko)         | [Broadcom](https://www.broadcom.com) |  [ytt](https://github.com/carvel-dev/ytt), [kapp-controller](https://github.com/carvel-dev/kapp-controller), [secretgen-controller](https://github.com/carvel-dev/secretgen-controller)  |
+| Bryce Palmer   | [everettraven](https://github.com/everettraven)         | [RedHat](https://www.redhat.com/en) |  [kapp](https://github.com/carvel-dev/kapp)  |
+| Rashmi Gottipati   | [rashmigottipati](https://github.com/rashmigottipati)    | [RedHat](https://www.redhat.com/en) |  [kapp](https://github.com/carvel-dev/kapp)  |
+| Devanshu   | [devanshuVmware](https://github.com/devanshuVmware)    | [Broadcom](https://www.broadcom.com) |  [kctrl](https://github.com/carvel-dev/kapp-controller/tree/develop/cli)  |
 
 
 ## Emeritus Maintainers and Stakeholders
@@ -32,6 +35,9 @@ Maintainers may focus on one or many tools. Some maintainers have different resp
 * John Ryan, [pivotaljohn](https://github.com/pivotaljohn)
 * Neil Hickey, [neil-hickey](https://github.com/neil-hickey)
 * Nanci Lancaster, [microwavables](https://github.com/microwavables)
+* Kumari Tanushree, [kumaritanushree](https://github.com/kumaritanushree)
+* Varsha Munishwar, [vmunishwar](https://github.com/vmunishwar)
+* Yash Sethiya, [sethiyash](https://github.com/sethiyash)     
 
 ## Carvel Stakeholders
 

diff --git a/site/content/kapp/docs/develop/command-reference.md b/site/content/kapp/docs/develop/command-reference.md
@@ -50,7 +50,7 @@ Apply flags:
 - `--apply-timeout`, _duration_, Maximum amount of time to wait in apply phase (default 15m0s)
 - `--dangerous-allow-empty-list-of-resources`, _boolean_, Allow to apply empty set of resources (same as running kapp delete)
 - `--dangerous-override-ownership-of-existing-resources`, _boolean_, Steal existing resources from another app
-- `--ownership-override-allowed-apps`, _strings_, Specify existing apps in the same namespace that existing resources can be stolen from if --dangerous-override-ownership-of-existing-resources is set
+- `--dangerous-ownership-override-allowed-apps`, _strings_, Specify existing apps in the same namespace that existing resources can be stolen from
 
 Wait flags:
 - `--wait`, _boolean_, Set to wait for changes to be applied (default true)

diff --git a/site/content/vendir/docs/develop/vendir-spec.md b/site/content/vendir/docs/develop/vendir-spec.md
@@ -150,6 +150,8 @@ directories:
       dangerousSkipTLSVerify: false
       # specify the response timeout in seconds for imgpkg when querying the registry; defaults to 30 (optional; v0.40.0+)
       responseHeaderTimeout: 30
+      # paths to PEM files containing additional CA certificates required to securely connect to registries
+      additionalCACertificates: []
 
     # fetches assets from a github release (optional)
     githubRelease:

diff --git a/site/content/ytt/docs/develop/how-to-write-schema.md b/site/content/ytt/docs/develop/how-to-write-schema.md
@@ -248,7 +248,7 @@ honeycomb:
   optional_config: null
 ```
 
-Here, `additional_config` can contain any valid YAML.
+Here, `optional_config` can contain any valid YAML.
 
 For example:
 
@@ -279,4 +279,4 @@ honeycomb:
 ---
 ## Next Steps
 
-Once you've declared your Data Values, they can be referenced in `ytt` templates as described in [Using Data Values > Referencing Data Values](how-to-use-data-values.md#referencing-data-values)
+Once you've declared your Data Values, they can be referenced in `ytt` templates as described in [Using Data Values > Referencing Data Values](how-to-use-data-values.md#referencing-data-values)
diff --git a/site/content/ytt/docs/v0.50.x/how-to-write-schema.md b/site/content/ytt/docs/v0.50.x/how-to-write-schema.md
@@ -249,7 +249,7 @@ honeycomb:
   optional_config: null
 ```
 
-Here, `additional_config` can contain any valid YAML.
+Here, `optional_config` can contain any valid YAML.
 
 For example:
 

diff --git a/site/static/install.sh b/site/static/install.sh
@@ -26,22 +26,22 @@ install() {
     binary_type=darwin-amd64
 
     ytt_checksum=d79f0b4189403c4142f5c646989de0769a316896a6096dfd1719605d313e8d1e
-    imgpkg_checksum=02a7e3fd0142c1053c14a87084820c1940f34c7372c16d883ef54091a37ac30d
-    kbld_checksum=2912583db28bc0caa88549ce142c6f30731e0580cd141e646673f4b733f52996
-    kapp_checksum=65084088d51fa0a43a31c71da175e8158844f776e2d2731f89cc51787823ed2d
+    imgpkg_checksum=578b81cedbba68057fbd5b917a337fb34c8ed7406931839efc01608668aa9bd0
+    kbld_checksum=a81eced438e60a0ba3c87c3823673eb9f935a8e0e7694c0232e70674001f014e
+    kapp_checksum=46b9961d8998c4a797ea3d648b83cf18be616945b48119d0b1e7a66813dc3658
     kwt_checksum=ea9e6eb76b203799d9f0d3177ac32b9d1d8e531bae363141dfe7030cb6e53a88
-    vendir_checksum=295714208c95c4a3602fc2308d098a7540a2b71fdc1e104f95b3816fa073852c
-    kctrl_checksum=0bee8254d2055bc833a197c777d2d79efc06c675c821da196765dacdae5ebeb0
+    vendir_checksum=ad63b667c7756cac7804e080861b3e794fbfc83ba662f5461928c30fe890a828
+    kctrl_checksum=a04c9e50130c0822d5b940aca1d3031fd6d3e065c907d70cd7b33b91199ff521
   else
     binary_type=linux-amd64
 
     ytt_checksum=61dec6e00131f990db853afc4b7531c318bd3af3ba18f2cfdbc0d5e83a45c445
-    imgpkg_checksum=4f87f219012e48b917d7aaf8b0ee71729f2572fc1a3deb7483bd8744fe2e1a06
-    kbld_checksum=2b1550a7293963fec0a4d2b6fdbfa9fc24af4a43035d18ba8e6f9b4c67662ad0
-    kapp_checksum=d760b51d8e9e3f5d0847e84fad05a51d1415fcfe309e10f885edd51d3e8c1301
+    imgpkg_checksum=d36ccfcc54143d2475cf09b0247c88bccf24a7aeb062bd9bb8cab7cb58135fcf
+    kbld_checksum=ffd557f0057c22b8f49ff77ee1ea40d93f3da2b9cb18a82e9dda9399970c2282
+    kapp_checksum=33702a40b6032ada742d73c59afeb393d0830a1913e3a599ca995eba3e68a57e
     kwt_checksum=1022483a8b59fe238e782a9138f1fee6ca61ecf7ccd1e5f0d98e95c56df94d87
-    vendir_checksum=3b1094bf45a9ff5c2915a986f4d7cee8480c3cab31c060445f851c48f397ee31
-    kctrl_checksum=9c33cfaae971718221c44feeca85faa703e7399f2e9d3fc98c9b1160ee765fb3
+    vendir_checksum=f878f3e16b702c47e42b2215a670d65028bc0158643ed28a2dfaa6f37b1344ac
+    kctrl_checksum=008e8543a1389ab29a75470a6f602b569e28fa866f72ddb214df32d57e09ed1c
   fi
 
   echo "Installing ${binary_type} binaries..."
@@ -55,25 +55,25 @@ install() {
   echo "Installed ${dst_dir}/ytt v0.50.0"
 
   echo "Installing imgpkg..."
-  $dl_bin https://github.com/carvel-dev/imgpkg/releases/download/v0.43.0/imgpkg-${binary_type} > /tmp/imgpkg
+  $dl_bin https://github.com/carvel-dev/imgpkg/releases/download/v0.43.1/imgpkg-${binary_type} > /tmp/imgpkg
   echo "${imgpkg_checksum}  /tmp/imgpkg" | shasum -c -
   mv /tmp/imgpkg ${dst_dir}/imgpkg
   chmod +x ${dst_dir}/imgpkg
-  echo "Installed ${dst_dir}/imgpkg v0.43.0"
+  echo "Installed ${dst_dir}/imgpkg v0.43.1"
 
   echo "Installing kbld..."
-  $dl_bin https://github.com/carvel-dev/kbld/releases/download/v0.44.0/kbld-${binary_type} > /tmp/kbld
+  $dl_bin https://github.com/carvel-dev/kbld/releases/download/v0.44.1/kbld-${binary_type} > /tmp/kbld
   echo "${kbld_checksum}  /tmp/kbld" | shasum -c -
   mv /tmp/kbld ${dst_dir}/kbld
   chmod +x ${dst_dir}/kbld
-  echo "Installed ${dst_dir}/kbld v0.44.0"
+  echo "Installed ${dst_dir}/kbld v0.44.1"
 
   echo "Installing kapp..."
-  $dl_bin https://github.com/carvel-dev/kapp/releases/download/v0.63.2/kapp-${binary_type} > /tmp/kapp
+  $dl_bin https://github.com/carvel-dev/kapp/releases/download/v0.63.3/kapp-${binary_type} > /tmp/kapp
   echo "${kapp_checksum}  /tmp/kapp" | shasum -c -
   mv /tmp/kapp ${dst_dir}/kapp
   chmod +x ${dst_dir}/kapp
-  echo "Installed ${dst_dir}/kapp v0.63.2"
+  echo "Installed ${dst_dir}/kapp v0.63.3"
 
   echo "Installing kwt..."
   $dl_bin https://github.com/carvel-dev/kwt/releases/download/v0.0.8/kwt-${binary_type} > /tmp/kwt
@@ -83,18 +83,18 @@ install() {
   echo "Installed ${dst_dir}/kwt v0.0.8"
 
   echo "Installing vendir..."
-  $dl_bin https://github.com/carvel-dev/vendir/releases/download/v0.41.0/vendir-${binary_type} > /tmp/vendir
+  $dl_bin https://github.com/carvel-dev/vendir/releases/download/v0.41.1/vendir-${binary_type} > /tmp/vendir
   echo "${vendir_checksum}  /tmp/vendir" | shasum -c -
   mv /tmp/vendir ${dst_dir}/vendir
   chmod +x ${dst_dir}/vendir
-  echo "Installed ${dst_dir}/vendir v0.41.0"
+  echo "Installed ${dst_dir}/vendir v0.41.1"
 
   echo "Installing kctrl..."
-  $dl_bin https://github.com/carvel-dev/kapp-controller/releases/download/v0.53.0/kctrl-${binary_type} > /tmp/kctrl
+  $dl_bin https://github.com/carvel-dev/kapp-controller/releases/download/v0.53.1/kctrl-${binary_type} > /tmp/kctrl
   echo "${kctrl_checksum}  /tmp/kctrl" | shasum -c -
   mv /tmp/kctrl ${dst_dir}/kctrl
   chmod +x ${dst_dir}/kctrl
-  echo "Installed ${dst_dir}/kctrl v0.53.0"
+  echo "Installed ${dst_dir}/kctrl v0.53.1"
 
 }