Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update plumbing reference from master to main 🪄 #707

Merged
merged 1 commit into from
Feb 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ If you need those for development, you'll need to ensure that:
- Install resources under `tekton/resources` to deploy the
`tekton-events` event listener
- Configure Tekton send cloud events to the `tekton-events`
event listener like on the [dogfooding](https://github.com/tektoncd/plumbing/blob/master/tekton/cd/pipeline/overlays/dogfooding/config-defaults.yaml) cluster.
event listener like on the [dogfooding](https://github.com/tektoncd/plumbing/blob/main/tekton/cd/pipeline/overlays/dogfooding/config-defaults.yaml) cluster.
- Create the [secret](https://github.com/tektoncd/plumbing/blob/534861ab15eb5787cac51512eaae6ca2101a7573/tekton/resources/ci/github-template.yaml#L121-L123)
needed by the GitHub update jobs to update status checks.

Expand Down
4 changes: 2 additions & 2 deletions adjustpermissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
adjustpermissions.py gives users access to the Tekton GCP projects

In order to interact with GCP resources
(https://github.com/tektoncd/plumbing/blob/master/README.md#gcp-projects)
(https://github.com/tektoncd/plumbing/blob/main/README.md#gcp-projects)
folks sometimes need to be able to do actions like push images and view
a project in the web console.

Expand Down Expand Up @@ -41,7 +41,7 @@
"tekton-releases",
"tekton-nightly",
)
BOSKOS_CONFIG_URL = "https://raw.githubusercontent.com/tektoncd/plumbing/master/boskos/boskos-config.yaml"
BOSKOS_CONFIG_URL = "https://raw.githubusercontent.com/tektoncd/plumbing/main/boskos/boskos-config.yaml"


def gcloud_required() -> None:
Expand Down
2 changes: 1 addition & 1 deletion bots/buildcaptain/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ data:

## Deploying

When connected to [the dogfood cluster](https://github.com/tektoncd/plumbing/blob/master/README.md#gcp-projects):
When connected to [the dogfood cluster](https://github.com/tektoncd/plumbing/blob/main/README.md#gcp-projects):

```bash
# must be run from the `buildcaptain` dir or it will use the go.mod file one level up
Expand Down
2 changes: 1 addition & 1 deletion bots/buildcaptain/cmd/buildcaptain/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/nlopes/slack"
)

const rotationURL = "https://raw.githubusercontent.com/tektoncd/plumbing/master/bots/buildcaptain/rotation.csv"
const rotationURL = "https://raw.githubusercontent.com/tektoncd/plumbing/main/bots/buildcaptain/rotation.csv"

var (
currentCaptain string
Expand Down
3 changes: 3 additions & 0 deletions bots/buildcaptain/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/cli v0.0.0-20190925022749-754388324470 h1:KrSeY2qJPl1blFLllwCMBIgwilomqEte/nb8dPhqY2o=
Expand Down Expand Up @@ -137,6 +138,7 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
Expand All @@ -159,6 +161,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/tektoncd/plumbing v0.0.0-20191206114338-712d544c2c21 h1:Cu7UQ0aAiRfMW5eAv9x1C8pZsa0FmIhzIcfSqbnCk1c=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
Expand Down
12 changes: 6 additions & 6 deletions docs/dogfooding.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ SSL Certificate are generated automatically using a `ClusterIssuer` managed by
- To deploy the `ClusterIssuer`:

```bash
kubectl apply -f https://github.com/tektoncd/plumbing/blob/master/tekton/certificates/clusterissuer.yaml
kubectl apply -f https://github.com/tektoncd/plumbing/blob/main/tekton/certificates/clusterissuer.yaml
```

- Apply the ingress resources and update the `*.tekton.dev` DNS configuration.
Ingress resources are deployed along with the corresponding service.

The following DNS names and corresponding ingresses are defined:

- `dashboard.dogfooding.tekton.dev`: [ingress](https://github.com/tektoncd/plumbing/blob/master/tekton/cd/dashboard/overlays/dogfooding/ingress.yaml)
- `dashboard.dogfooding.tekton.dev`: [ingress](https://github.com/tektoncd/plumbing/blob/main/tekton/cd/dashboard/overlays/dogfooding/ingress.yaml)

To see the IP of the ingress in the new cluster:

Expand All @@ -89,20 +89,20 @@ which shows Stackdriver log entries for PipelineRuns.
Manifests for various resources are deployed to the dogfooding clusters from different repositories.
For the plumbing repo, manifest are applied nightly through two cronjobs:

- [tekton](https://github.com/tektoncd/plumbing/tree/master/tekton/cronjobs/dogfooding/manifests/plumbing-tekton)
- [tekton-cronjobs](https://github.com/tektoncd/plumbing/tree/master/tekton/cronjobs/dogfooding/manifests/plumbing-tekton-cronjobs)
- [tekton](https://github.com/tektoncd/plumbing/tree/main/tekton/cronjobs/dogfooding/manifests/plumbing-tekton)
- [tekton-cronjobs](https://github.com/tektoncd/plumbing/tree/main/tekton/cronjobs/dogfooding/manifests/plumbing-tekton-cronjobs)

Manifests from other repos (pipeline, dashboard and triggers) are applied manually for now.

### Service Accounts

Service accounts definitions are stored in git and are applied as part of CD, expect for the case of
[Cluster Roles](https://github.com/tektoncd/plumbing/blob/master/tekton/resources/cd/serviceaccount.yaml)
[Cluster Roles](https://github.com/tektoncd/plumbing/blob/main/tekton/resources/cd/serviceaccount.yaml)
and related bindings, as they would require giving too broad access to the CD service account.

## Tekton Services

Tekton services are deployed using the [`deploy-release.sh`](https://github.com/tektoncd/plumbing/blob/master/scripts/deploy-release.sh)
Tekton services are deployed using the [`deploy-release.sh`](https://github.com/tektoncd/plumbing/blob/main/scripts/deploy-release.sh)
script, which submits a kubernets `Job` to the `robocat` cluster, to trigger a deployment on the
`dogfooding` cluster. The `Job` triggers and event listener on the `robocat` cluster, and triggers
a Tekton task that downloads a release from the release bucket, optionally applies overlays and
Expand Down
6 changes: 3 additions & 3 deletions label_sync/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ We currently run a cron job synchronize labels in
We use a separate cluster in a restricted project because modifying the labels requires write permission on all repos.

We have a CronJob to sync the labels, defined
[here](https://github.com/tektoncd/plumbing/blob/master/label_sync/cluster/label_sync_job.yaml).
[here](https://github.com/tektoncd/plumbing/blob/main/label_sync/cluster/label_sync_job.yaml).
After making changes to `labels.yaml`, we need to update the configmap
[label-config-v2](https://github.com/tektoncd/plumbing/blob/master/label_sync/cluster/label_sync_job.yaml#L37):
[label-config-v2](https://github.com/tektoncd/plumbing/blob/main/label_sync/cluster/label_sync_job.yaml#L37):
```
# Setup kubectl to point to prow cluster in tekton-release
kubectl -n github-admin delete configmap label-config-v2
Expand All @@ -63,7 +63,7 @@ kubectl -n github-admin create configmap label-config-v2 --from-file=labels.yaml
### Create a GitHub OAuth token

Use GitHub to create an OAuth token

* You need repo scope in order to modify labels on issues

```
Expand Down
2 changes: 1 addition & 1 deletion label_sync/labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
default:
labels:
##########################################################################
# Triage labels: Build Captains (more at https://github.com/tektoncd/plumbing/tree/master/buildcaptain) should
# Triage labels: Build Captains (more at https://github.com/tektoncd/plumbing/tree/main/buildcaptain) should
# apply these labels when triaging issues:
##########################################################################

Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
},
"plumbing": {
"repository": "github.com/tektoncd/plumbing",
"revision": "master"
"revision": "main"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tekton/cronjobs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/myimage:latest
- name: CONTEXT_PATH
Expand Down
2 changes: 1 addition & 1 deletion tekton/cronjobs/bases/configmap/trigger-resource-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: CONFIG_PATH
value: "config/"
- name: NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion tekton/cronjobs/bases/folder/trigger-resource-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: NAMESPACE
value: "default"
- name: CLUSTER_RESOURCE
Expand Down
2 changes: 1 addition & 1 deletion tekton/cronjobs/bases/image-build/trigger-image-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: TARGET_IMAGE
value: "gcr.io/tekton-releases/dogfooding/myimage:latest"
- name: PLATFORMS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
- name: PLUMBING_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: PLUMBING_REVISION
value: "master"
value: "main"
- name: RELEASE_BUCKET
value: "gs://tekton-releases"
- name: RELEASE_FILE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: CONFIG_PATH
value: "label_sync/labels.yaml"
- name: NAMESPACE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: CONFIG_PATH
value: "prow/config.yaml"
- name: NAMESPACE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: CONFIG_PATH
value: "label_sync/labels.yaml"
- name: NAMESPACE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: CONFIG_PATH
value: "prow/plugins.yaml"
- name: NAMESPACE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/alpine-git-nonroot:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/buildx-gcloud:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/coverage:latest
- name: CONTEXT_PATH
Expand Down
2 changes: 1 addition & 1 deletion tekton/cronjobs/dogfooding/images/hub-nightly/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/hub:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/ko-gcloud:latest
- name: CONTEXT_PATH
Expand Down
2 changes: 1 addition & 1 deletion tekton/cronjobs/dogfooding/images/ko-nightly/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/ko:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/kubectl:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/openssh-server:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/test-runner:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/skopeo:latest
- name: CONTEXT_PATH
Expand Down
2 changes: 1 addition & 1 deletion tekton/cronjobs/dogfooding/images/tkn-nightly/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/tkn:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: GIT_REPOSITORY
value: github.com/tektoncd/plumbing
- name: GIT_REVISION
value: master
value: main
- name: TARGET_IMAGE
value: gcr.io/tekton-releases/dogfooding/yamllint:latest
- name: CONTEXT_PATH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: NAMESPACE
value: "default"
- name: CLUSTER_RESOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: NAMESPACE
value: "default"
- name: CLUSTER_RESOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: NAMESPACE
value: ""
- name: CLUSTER_RESOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: NAMESPACE
value: ""
- name: CLUSTER_RESOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: NAMESPACE
value: ""
- name: CLUSTER_RESOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: GIT_REPOSITORY
value: "github.com/tektoncd/plumbing"
- name: GIT_REVISION
value: "master"
value: "main"
- name: NAMESPACE
value: "default"
- name: CLUSTER_RESOURCE
Expand Down
Loading