chore: migrate default branch to main (#1556)

sysdiglabs · Jan 17, 2024 · 4589543 · 4589543
1 parent a3bab9a
commit 4589543
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 31 deletions.
diff --git a/.github/updatecli.d/config-agent-release.yaml b/.github/updatecli.d/config-agent-release.yaml
@@ -10,7 +10,7 @@ scms:
       repository: "charts"
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: draios-jenkins
-      branch: "master"
+      branch: "main"
 
 actions:
   github:

diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml
@@ -17,4 +17,4 @@ jobs:
           on-failed-regex-fail-action: false
           on-failed-regex-create-review: true
           on-failed-regex-request-changes: true
-          on-failed-regex-comment: "PR title does not comply with regex: `%regex%`! <br /> Check PR guidelines at https://github.com/sysdiglabs/charts/blob/master/README.md#pull-requests"
+          on-failed-regex-comment: "PR title does not comply with regex: `%regex%`! <br /> Check PR guidelines at https://github.com/sysdiglabs/charts/blob/main/README.md#pull-requests"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -3,7 +3,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - master
+      - main
 
 env:
   GITHUB_USERNAME: draios-jenkins
@@ -192,5 +192,5 @@ jobs:
               git add ${chart_path}/RELEASE-NOTES.md
               git commit -m "github_actions_ci: Update CHANGELOG and RELEASE-NOTES for ${chart_name}-${chart_version}"
           done
-          # Push changes to the master branch.
-          git push origin "${GITHUB_REF##*/}":master -f
+          # Push changes to the main branch.
+          git push origin "${GITHUB_REF##*/}":main -f
diff --git a/.github/workflows/update-sysdig-deploy-chart.yaml b/.github/workflows/update-sysdig-deploy-chart.yaml
@@ -3,7 +3,7 @@ run-name: github actions is updating sysdig-deploy versions based on dependencie
 on:
   push:
     branches:
-      - master
+      - main
 jobs:
   update-sysdig-deploy-version:
     runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
         uses: peter-evans/[email protected]
         with:
           title: "chore(sysdig-deploy): Automatic version bump due to updated dependencies"
-          base: master
+          base: main
           delete-branch: true
           labels: automated PR
           token: ${{ secrets.TOOLS_JENKINS_ADMIN_ACCESS_GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ If you make changes to an existing chart, but do not change its version, nothing
 
 #### Add a new chart
 
-To add a new chart, create a directory inside _charts_ with it contents at _master_ branch.
+To add a new chart, create a directory inside _charts_ with it contents at _main_ branch.
 
 When you commit it, it will be picked up by the GitHub action, and if it contains a chart and version that doesn't already exist in the _charts repository_, a new release with the package for the chart will be published on the _GitHub repository_, and the list of all charts at `index.yaml` on _gh-pages_ branch will be updated on the _charts repository_.
 
@@ -105,9 +105,9 @@ https://charts.sysdig.com is managed through GithubPages action, `.github/workfl
 
 #### Publishing a new version of a chart
 
-> **TL;DR**: When a commit to master includes a new version of a _chart_, a GitHub action will make it available on the _charts repository_.
+> **TL;DR**: When a commit to main includes a new version of a _chart_, a GitHub action will make it available on the _charts repository_.
 
-With each commit to _master_, a GitHub action will compare all charts versions at the `charts` folder on _master_ branch with published versions at the `index.yaml` chart list on _gh-pages_ branch.
+With each commit to _main_, a GitHub action will compare all charts versions at the `charts` folder on _main_ branch with published versions at the `index.yaml` chart list on _gh-pages_ branch.
 
 When it detects that the version in the folder doesn't exist in  `index.yaml`, it will create a release with the packaged chart content on the _GitHub repository_, and update `index.yaml` to include it on the `charts repository`.
 

diff --git a/charts/admission-controller/Chart.yaml b/charts/admission-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: admission-controller
 description: Sysdig Admission Controller using Sysdig Secure inline image scanner
 type: application
-version: 0.14.18
+version: 0.14.19
 appVersion: 3.9.36
 home: https://sysdiglabs.github.io/admission-controller/
 icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4

diff --git a/charts/admission-controller/README.md b/charts/admission-controller/README.md
@@ -68,7 +68,7 @@ For example:
 
 ```bash
 helm upgrade --install admission-controller sysdig/admission-controller \
-    --create-namespace -n sysdig-admission-controller --version=0.14.18  \
+    --create-namespace -n sysdig-admission-controller --version=0.14.19  \
     --set sysdig.secureAPIToken=YOUR-KEY-HERE,clusterName=YOUR-CLUSTER-NAME
 ```
 
@@ -80,7 +80,7 @@ For example:
 
 ```bash
 helm upgrade --install admission-controller sysdig/admission-controller \
-     --create-namespace -n sysdig-admission-controller --version=0.14.18  \
+     --create-namespace -n sysdig-admission-controller --version=0.14.19  \
     --values values.yaml
 
 ```
@@ -225,8 +225,8 @@ The following table lists the configurable parameters of the `admission-controll
 
 
 ## Examples
-- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/master/charts/admission-controller/values.yaml)
-- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/master/charts/admission-controller/ci)
+- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/main/charts/admission-controller/values.yaml)
+- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/main/charts/admission-controller/ci)
 
 
 <!--

diff --git a/charts/admission-controller/README.tpl b/charts/admission-controller/README.tpl
@@ -96,8 +96,8 @@ The following table lists the configurable parameters of the `{{ .Chart.Name }}`
 
 
 ## Examples
-- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/master/charts/admission-controller/values.yaml)
-- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/master/charts/admission-controller/ci)
+- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/main/charts/admission-controller/values.yaml)
+- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/main/charts/admission-controller/ci)
 
 
 <!--

diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.37.4
+version: 1.37.5
 maintainers:
   - name: AlbertoBarba
     email: [email protected]
@@ -20,7 +20,7 @@ dependencies:
   - name: admission-controller
     # repository: https://charts.sysdig.com
     repository: file://../admission-controller
-    version: ~0.14.18
+    version: ~0.14.19
     alias: admissionController
     condition: admissionController.enabled
   - name: agent

diff --git a/charts/sysdig-deploy/README.md b/charts/sysdig-deploy/README.md
@@ -10,16 +10,16 @@ Helm v3.6 or above
 
 This chart deploys the following Sysdig components into your Kubernetes cluster:
 
-- [Sysdig Admission Controller](https://github.com/sysdiglabs/charts/tree/master/charts/admission-controller)
-- [Sysdig Agent](https://github.com/sysdiglabs/charts/tree/master/charts/agent)
-- [Sysdig Benchmark Runner (on-premises only)](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#benchmark-runner)
-- [Sysdig Host Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#host-analyzer-legacy)
-- [Sysdig Host Scanner](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#host-scanner)
-- [Sysdig KSPM Analyzer](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#kspm-analyzer-preview)
-- [Sysdig KSPM Collector](https://github.com/sysdiglabs/charts/tree/master/charts/kspm-collector)
-- [Sysdig Image Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#node-image-analyzer)
-- [Sysdig Rapid Response](https://github.com/sysdiglabs/charts/tree/master/charts/rapid-response)
-- [Sysdig Runtime Scanner](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#runtime-scanner)
+- [Sysdig Admission Controller](https://github.com/sysdiglabs/charts/tree/main/charts/admission-controller)
+- [Sysdig Agent](https://github.com/sysdiglabs/charts/tree/main/charts/agent)
+- [Sysdig Benchmark Runner (on-premises only)](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#benchmark-runner)
+- [Sysdig Host Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#host-analyzer-legacy)
+- [Sysdig Host Scanner](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#host-scanner)
+- [Sysdig KSPM Analyzer](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#kspm-analyzer-preview)
+- [Sysdig KSPM Collector](https://github.com/sysdiglabs/charts/tree/main/charts/kspm-collector)
+- [Sysdig Image Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#node-image-analyzer)
+- [Sysdig Rapid Response](https://github.com/sysdiglabs/charts/tree/main/charts/rapid-response)
+- [Sysdig Runtime Scanner](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#runtime-scanner)
 
 To deploy `sysdig-deploy`, follow the installation instructions given on the Sysdig Documentation website:
 
@@ -51,7 +51,7 @@ You can update the configurations by using either of the following:
 
 ### Example: Admission Controller
 
-See the `admission-controller` [README](https://github.com/sysdiglabs/charts/tree/master/charts/admission-controller/README.md) for the configuration values of the `admission-controller`. To override the Sysdig URL variable for the Admission Controller chart:
+See the `admission-controller` [README](https://github.com/sysdiglabs/charts/tree/main/charts/admission-controller/README.md) for the configuration values of the `admission-controller`. To override the Sysdig URL variable for the Admission Controller chart:
 
 #### Using the Key-Value Pair
 
@@ -92,7 +92,7 @@ The `values.yaml` file specifies the values for the configuration parameters.  Y
 
 ### Example: NodeAnalyzer
 
-See the `node-analyzer` subchart [README](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer/README.md) for the configuration values of the `nodeAnalyzer`. To override the API endpoint variable:
+See the `node-analyzer` subchart [README](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer/README.md) for the configuration values of the `nodeAnalyzer`. To override the API endpoint variable:
 
 #### Using the Key-Value Pair