Skip to content

Commit 7189162

Browse files
abayertekton-robot
authored andcommitted
Remove minimal-release.yaml and resolvers.yaml
Closes #5607 After discussion, we've decided to get rid of the separate `resolvers.yaml` and the resolver-less `minimal-release.yaml`. Signed-off-by: Andrew Bayer <[email protected]>
1 parent 824d618 commit 7189162

File tree

3 files changed

+5
-63
lines changed

3 files changed

+5
-63
lines changed

docs/install.md

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ To install Tekton Pipelines on a Kubernetes cluster:
8686
kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/latest/release.notags.yaml
8787
```
8888

89-
1. **Note**: To install Tekton Pipelines without including [the built-in remote resolvers](#installing-and-configuring-remote-task-and-pipeline-resolution)
90-
follow the directions above, but replace `release.yaml` or `release.notags.yaml` with `minimal-release.yaml` or
91-
`minimal-release.notags.yaml` as appropriate.
92-
9389
1. **Note**: Some cloud providers (such as [GKE](https://github.com/tektoncd/pipeline/issues/3317#issuecomment-708066087))
9490
may also require you to allow port 8443 in your firewall rules so that the Tekton Pipelines webhook is reachable.
9591

@@ -272,27 +268,9 @@ data:
272268
bucket.service.account.field.name: GOOGLE_APPLICATION_CREDENTIALS
273269
```
274270
275-
## Installing and configuring remote Task and Pipeline resolution
276-
277-
By default, when Tekton Pipelines is installed using `release.yaml` or `release.notags.yaml`, the
278-
[built-in resolvers](#built-in-resolvers) are installed into the `tekton-pipelines-resolvers` namespace.
279-
280-
### Installing built-in remote resolvers with a minimal Tekton Pipelines installation
281-
282-
If you have installed Tekton Pipelines using `minimal-release.yaml` or `minimal-release.notags.yaml` and
283-
wish to add the [built-in remote resolvers](#built-in-resolvers) later, you can install them separately
284-
by running the following command:
285-
286-
```bash
287-
kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/latest/resolvers.yaml
288-
```
289-
290-
To install a specific version, see [Installing Tekton Pipelines on Kubernetes](#installing-tekton-pipelines-on-kubernetes).
291-
Change `release.yaml` to `resolvers.yaml`.
292-
293-
### Built-in Resolvers
271+
## Configuring built-in remote Task and Pipeline resolution
294272
295-
Three remote resolvers are currently provided as part of the `resolvers.yaml` installation.
273+
Three remote resolvers are currently provided as part of the Tekton Pipelines installation.
296274
By default, these remote resolvers are disabled. Each resolver is enabled by setting
297275
the appropriate feature flag in the `resolvers-feature-flags` ConfigMap in the `tekton-pipelines-resolvers`
298276
namespace:

tekton/publish.yaml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ spec:
1111
default: github.com/tektoncd/pipeline
1212
- name: images
1313
description: List of cmd/* paths to be published as images
14-
default: "controller webhook entrypoint nop kubeconfigwriter git-init imagedigestexporter pullrequest-init workingdirinit"
15-
- name: resolverImages
16-
description: List of cmd/* paths to be published as images in release manifest resolvers.yaml
17-
default: "resolvers"
14+
default: "controller webhook entrypoint nop kubeconfigwriter git-init imagedigestexporter pullrequest-init workingdirinit resolvers"
1815
- name: versionTag
1916
description: The vX.Y.Z version that the artifacts should be tagged with (including `v`)
2017
- name: imageRegistry
@@ -164,20 +161,14 @@ spec:
164161
git tag $(params.versionTag)
165162
166163
ko resolve --platform=$(params.platforms) --preserve-import-paths -t $(params.versionTag) -R -f ${PROJECT_ROOT}/config/ > $OUTPUT_RELEASE_DIR/release.yaml
167-
ko resolve --platform=$(params.platforms) --preserve-import-paths -t $(params.versionTag) -l 'app.kubernetes.io/component!=resolvers' -R -f ${PROJECT_ROOT}/config/ > $OUTPUT_RELEASE_DIR/minimal-release.yaml
168-
ko resolve --platform=$(params.platforms) --preserve-import-paths -t $(params.versionTag) -f ${PROJECT_ROOT}/config/resolvers > $OUTPUT_RELEASE_DIR/resolvers.yaml
169164
# Publish images and create release.notags.yaml
170165
# This is useful if your container runtime doesn't support the `image-reference:tag@digest` notation
171166
# This is currently the case for `cri-o` (and most likely others)
172167
ko resolve --platform=$(params.platforms) --preserve-import-paths -R -f ${PROJECT_ROOT}/config/ > $OUTPUT_RELEASE_DIR/release.notags.yaml
173-
ko resolve --platform=$(params.platforms) --preserve-import-paths -l 'app.kubernetes.io/component!=resolvers' -R -f ${PROJECT_ROOT}/config/ > $OUTPUT_RELEASE_DIR/minimal-release.notags.yaml
174-
ko resolve --platform=$(params.platforms) --preserve-import-paths -f ${PROJECT_ROOT}/config/resolvers > $OUTPUT_RELEASE_DIR/resolvers.notags.yaml
175168
176169
# Rewrite "devel" to params.versionTag
177170
sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(params.versionTag)"/g' ${OUTPUT_RELEASE_DIR}/release.yaml
178171
sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(params.versionTag)"/g' ${OUTPUT_RELEASE_DIR}/release.notags.yaml
179-
sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(params.versionTag)"/g' ${OUTPUT_RELEASE_DIR}/resolvers.yaml
180-
sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(params.versionTag)"/g' ${OUTPUT_RELEASE_DIR}/resolvers.notags.yaml
181172
- name: koparse
182173
image: gcr.io/tekton-releases/dogfooding/koparse:latest
183174
script: |
@@ -190,20 +181,11 @@ spec:
190181
IMAGES="${IMAGES} ${IMAGES_PATH}/cmd/${cmd}:$(params.versionTag)"
191182
done
192183
193-
# Parse the built images from the minimal-release.yaml generated by ko
184+
# Parse the built images from the release.yaml generated by ko
194185
koparse \
195-
--path $OUTPUT_RELEASE_DIR/minimal-release.yaml \
186+
--path $OUTPUT_RELEASE_DIR/release.yaml \
196187
--base ${IMAGES_PATH} --images ${IMAGES} > /workspace/built_images
197188
198-
for cmd in $(params.resolverImages)
199-
do
200-
RESOLVER_IMAGES="${RESOLVER_IMAGES} ${IMAGES_PATH}/cmd/${cmd}:$(params.versionTag)"
201-
done
202-
203-
# Parse the built images from the resolvers.yaml generated by ko
204-
koparse \
205-
--path $OUTPUT_RELEASE_DIR/resolvers.yaml \
206-
--base ${IMAGES_PATH} --images ${RESOLVER_IMAGES} >> /workspace/built_images
207189
208190
- name: tag-images
209191
image: gcr.io/go-containerregistry/crane:debug

tekton/release-pipeline.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ spec:
5050
- name: release-file-no-tag
5151
description: the URL of the release file
5252
value: $(tasks.report-bucket.results.release-no-tag)
53-
- name: resolvers-file
54-
description: the URL of the resolvers release file
55-
value: $(tasks.report-bucket.results.resolvers)
56-
- name: resolvers-file-no-tag
57-
description: the URL of the resolvers release file
58-
value: $(tasks.report-bucket.results.resolvers-no-tag)
5953
tasks:
6054
- name: git-clone
6155
taskRef:
@@ -192,14 +186,6 @@ spec:
192186
description: The full URL of the release file in the bucket
193187
- name: release-no-tag
194188
description: The full URL of the release file (no tag) in the bucket
195-
- name: minimal-release
196-
description: The full URL of the minimal release (without resolvers) file in the bucket
197-
- name: minimal-release-no-tag
198-
description: The full URL of the minimal release file (without resolvers, no tag) in the bucket
199-
- name: resolvers
200-
description: The full URL of the resolvers release file in the bucket
201-
- name: resolvers-no-tag
202-
description: The full URL of the resolvers file (no tag) in the bucket
203189
steps:
204190
- name: create-results
205191
image: alpine
@@ -214,7 +200,3 @@ spec:
214200
BASE_URL=$(echo ${BASE_URL} | sed 's,gs://,https://storage.googleapis.com/,g')
215201
echo "${BASE_URL}/release.yaml" > $(results.release.path)
216202
echo "${BASE_URL}/release.notag.yaml" > $(results.release-no-tag.path)
217-
echo "${BASE_URL}/minimal-release.yaml" > $(results.minimal-release.path)
218-
echo "${BASE_URL}/minimal-release.notag.yaml" > $(results.minimal-release-no-tag.path)
219-
echo "${BASE_URL}/resolvers.yaml" > $(results.resolvers.path)
220-
echo "${BASE_URL}/resolvers.notags.yaml" > $(results.resolvers-no-tag.path)

0 commit comments

Comments
 (0)