Merge branch 'main' into patch-2

rstudio · Dec 20, 2024 · 9daaafe · 9daaafe
2 parents 18a6126 + bd53485
commit 9daaafe
Show file tree

Hide file tree

Showing 172 changed files with 4,896 additions and 844 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+*.yml linguist-detectable=true
+*.yml linguist-language=YAML
+*.qmd linguist-language=Markdown
+*.md linguist-detectable
+*.qmd linguist-detectable
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,9 +1,19 @@
 # format per https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#about-code-owners
-* @colearendt @atheriel
+* @rstudio/infraops @rstudio/platform-cloud
 
 # package-manager resources
-/charts/rstudio-pm/* @rstudio/ppm
+/charts/rstudio-pm/** @rstudio/ppm
+/ci/rstudio-pm/** @rstudio/ppm
 
 # connect resources
-/charts/rstudio-connect/* @aronatkins @dbkegley @christierney @zackverham
-/examples/connect/* @aronatkins @dbkegley @christierney @zackverham
+/charts/rstudio-connect/** @aronatkins @dbkegley @christierney @zackverham
+/ci/rstudio-connect/** @aronatkins @dbkegley @christierney @zackverham
+/examples/connect/** @aronatkins @dbkegley @christierney @zackverham
+
+# posit-chronicle resources
+/charts/posit-chronicle/** @matt-urbina @markrtucker @t-margheim
+/ci/posit-chronicle/** @matt-urbina @markrtucker @t-margheim
+
+# rstudio-workbench resources
+/charts/rstudio-workbench/** @GCrev @zachhannum
+/ci/rstudio-workbench/** @GCrev @zachhannum
diff --git a/.github/workflows/chart-doc.yaml b/.github/workflows/chart-doc.yaml
@@ -9,30 +9,29 @@ jobs:
     name: helm-docs
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4.2.0
         with:
           version: v3.6.3
 
-      - name: Install helm-docs
-        env:
-          version: 1.5.0
-        run: |
-          echo "Installing helm-docs version $version"
-          curl -L -o helm-docs.tar.gz https://github.com/norwoodj/helm-docs/releases/download/v${version}/helm-docs_${version}_Linux_x86_64.tar.gz
-          tar -xzvf helm-docs.tar.gz helm-docs
-          rm -rf helm-docs.tar.gz
+      - name: install Just
+        uses: extractions/setup-just@v2
 
-      - name: Run helm-docs
-        run: |
-          ./helm-docs --chart-search-root=charts --template-files=README.md.gotmpl --template-files=./_templates.gotmpl
-          ./helm-docs --chart-search-root=other-charts --template-files=README.md.gotmpl --template-files=./_templates.gotmpl
+      - name: Install Quarto
+        uses: quarto-dev/quarto-actions/setup@v2
+        with:
+          version: pre-release
+
+      - name: Render Quarto Project
+        uses: quarto-dev/quarto-actions/render@v2
+        env:
+          HELM_DOCS_VERSION: 1.13.1
 
       - name: Commit results
         run: |
@@ -45,30 +44,53 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Notify Slack of chart documentation failure
+        if: failure()
+        uses: slackapi/[email protected]
+        with:
+          payload-delimiter: "_"
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "Chart Documentation failed, please check the logs.  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                  }
+                }
+              ]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+
   rbac:
     runs-on: ubuntu-latest
     name: rbac
     needs: document
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4.2.0
         with:
           version: v3.6.3
 
+      - name: Add rstudio helm repo
+        run: helm repo add rstudio https://helm.rstudio.com
+
+      - name: install Just
+        uses: extractions/setup-just@v2
+
       - name: Compute and update dependent files
         run: |
-          set -xe
-          cd ./charts/rstudio-launcher-rbac && helm dependency build && cd -
-          helm template -n rstudio rstudio-launcher-rbac ./charts/rstudio-launcher-rbac --set removeNamespaceReferences=true > examples/rbac/rstudio-launcher-rbac.yaml
-          CHART_VERSION=$(helm show chart ./charts/rstudio-launcher-rbac | grep '^version' | cut -d ' ' -f 2)
-          cp examples/rbac/rstudio-launcher-rbac.yaml examples/rbac/rstudio-launcher-rbac-${CHART_VERSION}.yaml
+          just rbac
 
       - name: Commit results
         run: |
@@ -81,3 +103,24 @@ jobs:
       - uses: r-lib/actions/pr-push@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Notify Slack of chart documentation (rbac) failure
+        if: failure()
+        uses: slackapi/[email protected]
+        with:
+          payload-delimiter: "_"
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "Chart Documentation (RBAC) failed, please check the logs.  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                  }
+                }
+              ]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
diff --git a/.github/workflows/chart-rebuild.yaml b/.github/workflows/chart-rebuild.yaml
@@ -7,19 +7,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: 'gh-pages'
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4.2.0
         with:
           version: v3.6.3
 
+      - name: Add rstudio helm repo
+        run: helm repo add rstudio https://helm.rstudio.com
+
       - name: Rebuild index.yaml
         env:
           version: v1.2.1
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if [[ ! -d "$RUNNER_TOOL_CACHE" ]]; then
               echo "Cache directory '$RUNNER_TOOL_CACHE' does not exist" >&2
@@ -46,7 +51,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Rebuild index.yaml
           title: Rebuild index.yaml
@@ -55,3 +60,24 @@ jobs:
         run: |
           echo "Created Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
           echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+      - name: Notify Slack of index.yaml rebuild failure
+        if: failure()
+        uses: slackapi/[email protected]
+        with:
+          payload-delimiter: "_"
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "Rebuild of index.yaml failed, please check the logs.  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                  }
+                }
+              ]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
diff --git a/.github/workflows/chart-releaser.yaml b/.github/workflows/chart-releaser.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -20,10 +20,13 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Install Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4.2.0
         with:
           version: v3.6.3
 
+      - name: Add rstudio helm repo
+        run: helm repo add rstudio https://helm.rstudio.com
+
       - name: Run chart-releaser
         uses: helm/[email protected]
         with:
@@ -38,3 +41,24 @@ jobs:
           charts_repo_url: https://helm.rstudio.com
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Notify Slack of chart release failure
+        if: failure()
+        uses: slackapi/[email protected]
+        with:
+          payload-delimiter: "_"
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "Chart Release failed, please check the logs.  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                  }
+                }
+              ]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK