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

Add cherrypicker to prow deployment bundle #7393

Closed
Closed
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
1 change: 1 addition & 0 deletions prow/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ docker_bundle(
"tot",
) + prow_docker_tags(**{
prow_prefix("needs-rebase"): "//prow/external-plugins/needs-rebase:image",
prow_prefix("cherrypicker"): "//prow/external-plugins/cherrypicker:image",
}),
stamp = True,
)
Expand Down
1 change: 1 addition & 0 deletions prow/cluster/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ release(
component("tls-ing", "ingress"),
component("tot", "service", "deployment"),
component("needs-rebase", "deployment"),
component("cherrypicker", "deployment"),
)

component("starter", MULTI_KIND)
Expand Down
51 changes: 51 additions & 0 deletions prow/cluster/cherrypicker_deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Copyright 2018 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: cherrypicker
labels:
app: cherrypicker
spec:
replicas: 1
template:
metadata:
labels:
app: cherrypicker
spec:
terminationGracePeriodSeconds: 180
containers:
- name: cherrypicker
image: gcr.io/k8s-prow/cherrypicker:latest
imagePullPolicy: Always
args:
- --dry-run=false
ports:
- name: http
containerPort: 8888
volumeMounts:
- name: hmac
mountPath: /etc/webhook
readOnly: true
- name: oauth
mountPath: /etc/github
readOnly: true
volumes:
- name: hmac
secret:
secretName: hmac-token
- name: oauth
secret:
secretName: oauth-token
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest using a bot different from k8s-ci-robot. All it needs is org membership in order for its PRs to get automatically tested but other than that it shouldn't need any write permissions in repos.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fejta-bot perhaps? 🙃
thoughts @fejta?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do decide to use that bot do we just replace "oauth-token" with "fejta-bot-token" ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or do we need a new bot / token

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fejta-bot sgtm assuming it needs no permissions to anything aside from a github account

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to set up a new token for it, or is there an existing one?

I can't find any mention of fejta-bot in this repo, aside from a few comments.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @fejta

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Search prow/config.yaml for prior art:

test-infra/prow/config.yaml

Lines 13705 to 13716 in 5b2902d

- --token-file=/etc/token/bot-github-token
- --test-owners-csv=/test_owners.csv
- --triage-window=1
- --triage-count=10
- --flakyjob-count=3
volumeMounts:
- name: token
mountPath: /etc/token
volumes:
- name: token
secret:
secretName: fejta-bot-token

25 changes: 25 additions & 0 deletions prow/cluster/cherrypicker_service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright 2018 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: v1
kind: Service
metadata:
name: cherrypicker
spec:
selector:
app: cherrypicker
ports:
- port: 80
targetPort: 8888
type: NodePort
25 changes: 25 additions & 0 deletions prow/external-plugins/cherrypicker/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_bundle")
load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
load("@io_bazel_rules_docker//go:image.bzl", "go_image")

docker_bundle(
name = "bundle",
images = {
"{STABLE_PROW_REPO}/cherrypicker:{DOCKER_TAG}": ":image",
"{STABLE_PROW_REPO}/cherrypicker:latest": ":image",
"{STABLE_PROW_REPO}/cherrypicker:latest-{BUILD_USER}": ":image",
},
stamp = True,
)

docker_push(
name = "push",
bundle = ":bundle",
)

go_image(
name = "image",
binary = ":cherrypicker",
visibility = ["//visibility:public"],
)

load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")

go_library(
Expand Down
4 changes: 4 additions & 0 deletions prow/plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,10 @@ external_plugins:
events:
- pull_request
kubernetes/kubernetes:
- name: cherrypicker
events:
- issue_comment
- pull_request
- name: needs-rebase
events:
- pull_request
Expand Down