Skip to content

Commit 6779d49

Browse files
committed
chore: rename default branch
1 parent 0e4f052 commit 6779d49

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/ISSUE_TEMPLATE/release.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ about: Create release checklist
2727

2828
## Cluster Monitoring Operator
2929

30-
- [ ] update and pin jsonnet dependencies in [jsonnet/jsonnetfile.json](https://github.com/openshift/cluster-monitoring-operator/blob/master/jsonnet/jsonnetfile.json).
30+
- [ ] update and pin jsonnet dependencies in [jsonnet/jsonnetfile.json](https://github.com/openshift/cluster-monitoring-operator/blob/main/jsonnet/jsonnetfile.json).
3131
- example: https://github.com/openshift/cluster-monitoring-operator/blob/release-4.3/jsonnet/jsonnetfile.json
3232
- dependencies should be pinned to branches released in previous paragraph
3333
- ensure `jsonnet/version.json` file is tracking up-to-date component versions by running `make versions` and regenerating `assets/` if necessary
34-
- [ ] update golang dependencies in [go.mod](https://github.com/openshift/cluster-monitoring-operator/blob/master/go.mod) and [hack/tools/go.mod](https://github.com/openshift/cluster-monitoring-operator/blob/master/hack/tools/go.mod) files.
34+
- [ ] update golang dependencies in [go.mod](https://github.com/openshift/cluster-monitoring-operator/blob/main/go.mod) and [hack/tools/go.mod](https://github.com/openshift/cluster-monitoring-operator/blob/main/hack/tools/go.mod) files.
3535
- most important are dependencies on prometheus-operator and kubernetes components
3636
- update the tooling prometheus dependency to be in sync with the main one

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you want to make changes to the actual code, please follow the [Coding Style]
2323
## General workflow information
2424
These steps outline the general contribution workflow:
2525

26-
* Create a topic branch from where you want to base your work (usually master).
26+
* Create a topic branch from where you want to base your work (usually main).
2727
* Make commits of logical units.
2828
* Make sure your commit messages are in the proper format (see [Format of the Commit Message](#format-of-the-commit-message))
2929
* Push your changes to a topic branch in your fork of the repository.

Documentation/sample-metrics.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Sample Metrics
22

33
To understand what metrics are collected by the Telemeter service, we can replicate the request that the Telemeter client makes against a running OpenShift cluster's Prometheus service.
4-
The Telemeter client makes an HTTP GET request to Prometheus' `/federate` endpoint with the [metrics match rules](https://github.com/openshift/cluster-monitoring-operator/blob/master/Documentation/telemetry/telemeter_query) URL encoded as query parameters.
4+
The Telemeter client makes an HTTP GET request to Prometheus' `/federate` endpoint with the [metrics match rules](https://github.com/openshift/cluster-monitoring-operator/blob/main/Documentation/telemetry/telemeter_query) URL encoded as query parameters.
55

66
To start, find the URL for the Prometheus service running in the OpenShift cluster:
77
```shell

hack/go/generate_versions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
const (
20-
mainBranch = "master"
20+
mainBranch = "main"
2121
metricsServerRepo = "openshift/kubernetes-metrics-server"
2222
versionFile = "../../jsonnet/versions.yaml"
2323
versionNotFound = "N/A"

0 commit comments

Comments
 (0)