diff --git a/.github/updatecli.d/config-agent-release.yaml b/.github/updatecli.d/config-agent-release.yaml index fa71c9bb5..3a17c0333 100644 --- 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 index 6c7e97fe2..4886ceb6c 100644 --- 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%`!
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%`!
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 index 63732d8d1..991706eb1 100644 --- 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 index f4c154820..6c365c3a1 100644 --- 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/create-pull-request@v5.0.2 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 index bf21219d5..5a9de3661 100644 --- 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 index 9490c1f91..335b9fc89 100644 --- 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 index 5fed0e155..8b695fd56 100644 --- 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)