Skip to content

Commit

Permalink
Downgrade Triggers until we have time to deal with long pod names
Browse files Browse the repository at this point in the history
resulting from our use of $(uid) with tektoncd/triggers#926.

Long pod names work, but usability suffers. In particular with
tasks in a pipeline we no longer see the task name in kubectl watch.

For Dashboard it's also impractical because the pod name is the
headline of the taskrun page.

A solution could be based on generateName, like Triggers' PR 939.
  • Loading branch information
solsson committed Mar 13, 2021
1 parent 5b1a508 commit ada46c7
Showing 1 changed file with 43 additions and 52 deletions.
95 changes: 43 additions & 52 deletions tekton/triggers-release/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ rules:
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
- apiGroups: ["serving.knative.dev"]
resources: ["*", "*/status", "*/finalizers"]
verbs: ["get", "list", "create", "update", "delete", "deletecollection", "patch", "watch"]
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -364,8 +361,8 @@ metadata:
labels:
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
version: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
version: "v0.11.2"
spec:
group: triggers.tekton.dev
scope: Cluster
Expand Down Expand Up @@ -418,8 +415,8 @@ metadata:
labels:
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
version: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
version: "v0.11.2"
spec:
group: triggers.tekton.dev
scope: Namespaced
Expand Down Expand Up @@ -461,12 +458,6 @@ spec:
- name: Reason
type: string
jsonPath: ".status.conditions[?(@.type=='Available')].reason"
- name: Ready
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].status"
- name: Reason
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].reason"

---
# Copyright 2019 The Tekton Authors
Expand All @@ -490,8 +481,8 @@ metadata:
labels:
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
version: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
version: "v0.11.2"
spec:
group: triggers.tekton.dev
scope: Namespaced
Expand Down Expand Up @@ -546,8 +537,8 @@ metadata:
labels:
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
version: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
version: "v0.11.2"
spec:
group: triggers.tekton.dev
scope: Namespaced
Expand Down Expand Up @@ -602,8 +593,8 @@ metadata:
labels:
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
version: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
version: "v0.11.2"
spec:
group: triggers.tekton.dev
scope: Namespaced
Expand Down Expand Up @@ -660,7 +651,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
# The data is populated at install time.
---
apiVersion: admissionregistration.k8s.io/v1
Expand All @@ -671,7 +662,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
webhooks:
- admissionReviewVersions:
- v1beta1
Expand All @@ -692,7 +683,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
webhooks:
- admissionReviewVersions:
- v1beta1
Expand All @@ -713,7 +704,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
webhooks:
- admissionReviewVersions:
- v1beta1
Expand Down Expand Up @@ -944,11 +935,11 @@ metadata:
app.kubernetes.io/name: controller
app.kubernetes.io/component: controller
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
app: tekton-triggers-controller
version: "v0.12.0"
version: "v0.11.2"
name: tekton-triggers-controller
namespace: tekton-pipelines
spec:
Expand Down Expand Up @@ -987,10 +978,10 @@ metadata:
app.kubernetes.io/name: controller
app.kubernetes.io/component: controller
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
# tekton.dev/release value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
spec:
replicas: 1
selector:
Expand All @@ -1007,18 +998,18 @@ spec:
app.kubernetes.io/name: controller
app.kubernetes.io/component: controller
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
app: tekton-triggers-controller
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
# version value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml
version: "v0.12.0"
version: "v0.11.2"
spec:
serviceAccountName: tekton-triggers-controller
containers:
- name: tekton-triggers-controller
image: "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/controller:v0.12.0@sha256:95216490efb0319209c4f708e94dc0c33541dc151a78b617d253044d92382f61"
args: ["-logtostderr", "-stderrthreshold", "INFO", "-el-image", "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/eventlistenersink:v0.12.0@sha256:b2e535d8b291bb5120ac171b54eb4218c0caccaff5687ff8a76c2641a1233dcd", "-el-port", "8080", "-el-readtimeout", "5", "-el-writetimeout", "40", "-el-idletimeout", "120", "-el-timeouthandler", "30", "-period-seconds", "10", "-failure-threshold", "1"]
image: "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/controller:v0.11.2@sha256:5ecf765dfed226e0b0b466ed971d3641991fb9069fc3249a1fcb92fe350fbe95"
args: ["-logtostderr", "-stderrthreshold", "INFO", "-el-image", "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/eventlistenersink:v0.11.2@sha256:ad7e626c0928fb762cb9880a29c18b15a30d44af405b7f102e8a18f21b640b2c", "-el-port", "8080", "-el-readtimeout", "5", "-el-writetimeout", "40", "-el-idletimeout", "120", "-el-timeouthandler", "30", "-period-seconds", "10", "-failure-threshold", "1"]
env:
- name: SYSTEM_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -1059,10 +1050,10 @@ metadata:
app.kubernetes.io/name: core-interceptors
app.kubernetes.io/component: interceptors
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
# tekton.dev/release value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
spec:
replicas: 1
selector:
Expand All @@ -1077,17 +1068,17 @@ spec:
app.kubernetes.io/name: core-interceptors
app.kubernetes.io/component: interceptors
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
app: tekton-triggers-core-interceptors
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
# version value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml
version: "v0.12.0"
version: "v0.11.2"
spec:
serviceAccountName: tekton-triggers-core-interceptors
containers:
- name: tekton-triggers-core-interceptors
image: "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/interceptors:v0.12.0@sha256:39ce10354f553acb7e88b3562e888220f09bbaea95eba92340049c6a632c9fde"
- name: tekton-triggers-controller
image: "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/interceptors:v0.11.2@sha256:87a84f66f96ed17728ff9d3f6cba200d56c0c12eb5fbc06dee959cfb0c49197d"
args: ["-logtostderr", "-stderrthreshold", "INFO"]
env:
- name: SYSTEM_NAMESPACE
Expand Down Expand Up @@ -1116,11 +1107,11 @@ metadata:
app.kubernetes.io/name: tekton-triggers-core-interceptors
app.kubernetes.io/component: interceptors
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
app: tekton-triggers-core-interceptors
version: "v0.12.0"
version: "v0.11.2"
name: tekton-triggers-core-interceptors
namespace: tekton-pipelines
spec:
Expand Down Expand Up @@ -1158,11 +1149,11 @@ metadata:
app.kubernetes.io/name: webhook
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
app: tekton-triggers-webhook
version: "v0.12.0"
triggers.tekton.dev/release: "v0.12.0"
version: "v0.11.2"
triggers.tekton.dev/release: "v0.11.2"
spec:
ports:
- name: https-webhook
Expand Down Expand Up @@ -1198,10 +1189,10 @@ metadata:
app.kubernetes.io/name: webhook
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
# tekton.dev/release value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
spec:
replicas: 1
selector:
Expand All @@ -1218,19 +1209,19 @@ spec:
app.kubernetes.io/name: webhook
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/version: "v0.12.0"
app.kubernetes.io/version: "v0.11.2"
app.kubernetes.io/part-of: tekton-triggers
app: tekton-triggers-webhook
triggers.tekton.dev/release: "v0.12.0"
triggers.tekton.dev/release: "v0.11.2"
# version value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml
version: "v0.12.0"
version: "v0.11.2"
spec:
serviceAccountName: tekton-triggers-webhook
containers:
- name: webhook
# This is the Go import path for the binary that is containerized
# and substituted here.
image: "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/webhook:v0.12.0@sha256:60f3222edc57f3114a5747385d882495ba36128b1cd90fd06e2b8b8d139d4c85"
image: "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/webhook:v0.11.2@sha256:5d6153712e33fcd973e6099d6db6a38e06b5061a519bd45887219f9aacbf50b9"
env:
- name: SYSTEM_NAMESPACE
valueFrom:
Expand Down

0 comments on commit ada46c7

Please sign in to comment.