Skip to content

Commit 4589543

Browse files
authored
chore: migrate default branch to main (#1556)
1 parent a3bab9a commit 4589543

File tree

10 files changed

+31
-31
lines changed

10 files changed

+31
-31
lines changed

.github/updatecli.d/config-agent-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ scms:
1010
repository: "charts"
1111
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
1212
username: draios-jenkins
13-
branch: "master"
13+
branch: "main"
1414

1515
actions:
1616
github:

.github/workflows/pr-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
on-failed-regex-fail-action: false
1818
on-failed-regex-create-review: true
1919
on-failed-regex-request-changes: true
20-
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"
20+
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"

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release Charts
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
env:
99
GITHUB_USERNAME: draios-jenkins
@@ -192,5 +192,5 @@ jobs:
192192
git add ${chart_path}/RELEASE-NOTES.md
193193
git commit -m "github_actions_ci: Update CHANGELOG and RELEASE-NOTES for ${chart_name}-${chart_version}"
194194
done
195-
# Push changes to the master branch.
196-
git push origin "${GITHUB_REF##*/}":master -f
195+
# Push changes to the main branch.
196+
git push origin "${GITHUB_REF##*/}":main -f

.github/workflows/update-sysdig-deploy-chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run-name: github actions is updating sysdig-deploy versions based on dependencie
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
jobs:
88
update-sysdig-deploy-version:
99
runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
4545
uses: peter-evans/[email protected]
4646
with:
4747
title: "chore(sysdig-deploy): Automatic version bump due to updated dependencies"
48-
base: master
48+
base: main
4949
delete-branch: true
5050
labels: automated PR
5151
token: ${{ secrets.TOOLS_JENKINS_ADMIN_ACCESS_GITHUB_TOKEN }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you make changes to an existing chart, but do not change its version, nothing
2020

2121
#### Add a new chart
2222

23-
To add a new chart, create a directory inside _charts_ with it contents at _master_ branch.
23+
To add a new chart, create a directory inside _charts_ with it contents at _main_ branch.
2424

2525
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_.
2626

@@ -105,9 +105,9 @@ https://charts.sysdig.com is managed through GithubPages action, `.github/workfl
105105

106106
#### Publishing a new version of a chart
107107

108-
> **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_.
108+
> **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_.
109109
110-
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.
110+
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.
111111

112112
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`.
113113

charts/admission-controller/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: admission-controller
33
description: Sysdig Admission Controller using Sysdig Secure inline image scanner
44
type: application
5-
version: 0.14.18
5+
version: 0.14.19
66
appVersion: 3.9.36
77
home: https://sysdiglabs.github.io/admission-controller/
88
icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4

charts/admission-controller/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ For example:
6868

6969
```bash
7070
helm upgrade --install admission-controller sysdig/admission-controller \
71-
--create-namespace -n sysdig-admission-controller --version=0.14.18 \
71+
--create-namespace -n sysdig-admission-controller --version=0.14.19 \
7272
--set sysdig.secureAPIToken=YOUR-KEY-HERE,clusterName=YOUR-CLUSTER-NAME
7373
```
7474

@@ -80,7 +80,7 @@ For example:
8080

8181
```bash
8282
helm upgrade --install admission-controller sysdig/admission-controller \
83-
--create-namespace -n sysdig-admission-controller --version=0.14.18 \
83+
--create-namespace -n sysdig-admission-controller --version=0.14.19 \
8484
--values values.yaml
8585

8686
```
@@ -225,8 +225,8 @@ The following table lists the configurable parameters of the `admission-controll
225225

226226

227227
## Examples
228-
- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/master/charts/admission-controller/values.yaml)
229-
- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/master/charts/admission-controller/ci)
228+
- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/main/charts/admission-controller/values.yaml)
229+
- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/main/charts/admission-controller/ci)
230230

231231

232232
<!--

charts/admission-controller/README.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ The following table lists the configurable parameters of the `{{ .Chart.Name }}`
9696

9797

9898
## Examples
99-
- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/master/charts/admission-controller/values.yaml)
100-
- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/master/charts/admission-controller/ci)
99+
- [Default `values.yaml`](https://github.com/sysdiglabs/charts/blob/main/charts/admission-controller/values.yaml)
100+
- Find some [examples of these values](https://github.com/sysdiglabs/charts/tree/main/charts/admission-controller/ci)
101101

102102

103103
<!--

charts/sysdig-deploy/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: sysdig-deploy
33
description: A chart with various Sysdig components for Kubernetes
44
type: application
5-
version: 1.37.4
5+
version: 1.37.5
66
maintainers:
77
- name: AlbertoBarba
88
@@ -20,7 +20,7 @@ dependencies:
2020
- name: admission-controller
2121
# repository: https://charts.sysdig.com
2222
repository: file://../admission-controller
23-
version: ~0.14.18
23+
version: ~0.14.19
2424
alias: admissionController
2525
condition: admissionController.enabled
2626
- name: agent

charts/sysdig-deploy/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ Helm v3.6 or above
1010

1111
This chart deploys the following Sysdig components into your Kubernetes cluster:
1212

13-
- [Sysdig Admission Controller](https://github.com/sysdiglabs/charts/tree/master/charts/admission-controller)
14-
- [Sysdig Agent](https://github.com/sysdiglabs/charts/tree/master/charts/agent)
15-
- [Sysdig Benchmark Runner (on-premises only)](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#benchmark-runner)
16-
- [Sysdig Host Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#host-analyzer-legacy)
17-
- [Sysdig Host Scanner](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#host-scanner)
18-
- [Sysdig KSPM Analyzer](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#kspm-analyzer-preview)
19-
- [Sysdig KSPM Collector](https://github.com/sysdiglabs/charts/tree/master/charts/kspm-collector)
20-
- [Sysdig Image Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#node-image-analyzer)
21-
- [Sysdig Rapid Response](https://github.com/sysdiglabs/charts/tree/master/charts/rapid-response)
22-
- [Sysdig Runtime Scanner](https://github.com/sysdiglabs/charts/tree/master/charts/node-analyzer#runtime-scanner)
13+
- [Sysdig Admission Controller](https://github.com/sysdiglabs/charts/tree/main/charts/admission-controller)
14+
- [Sysdig Agent](https://github.com/sysdiglabs/charts/tree/main/charts/agent)
15+
- [Sysdig Benchmark Runner (on-premises only)](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#benchmark-runner)
16+
- [Sysdig Host Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#host-analyzer-legacy)
17+
- [Sysdig Host Scanner](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#host-scanner)
18+
- [Sysdig KSPM Analyzer](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#kspm-analyzer-preview)
19+
- [Sysdig KSPM Collector](https://github.com/sysdiglabs/charts/tree/main/charts/kspm-collector)
20+
- [Sysdig Image Analyzer (on-premises only)](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#node-image-analyzer)
21+
- [Sysdig Rapid Response](https://github.com/sysdiglabs/charts/tree/main/charts/rapid-response)
22+
- [Sysdig Runtime Scanner](https://github.com/sysdiglabs/charts/tree/main/charts/node-analyzer#runtime-scanner)
2323

2424
To deploy `sysdig-deploy`, follow the installation instructions given on the Sysdig Documentation website:
2525

@@ -51,7 +51,7 @@ You can update the configurations by using either of the following:
5151

5252
### Example: Admission Controller
5353

54-
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:
54+
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:
5555

5656
#### Using the Key-Value Pair
5757

@@ -92,7 +92,7 @@ The `values.yaml` file specifies the values for the configuration parameters. Y
9292

9393
### Example: NodeAnalyzer
9494

95-
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:
95+
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:
9696

9797
#### Using the Key-Value Pair
9898

0 commit comments

Comments
 (0)