Make ConsoleCLiDownload supply binaries from local #447

piyush-garg · 2021-10-13T08:05:40Z

This will add a deployment in OpenShift addon which will serve
all the binaries of tkn CLI and installed through installerset
then another installerset will run after the previous is completely run
to install ConsoleCLIDownload which will have the links to the binaries
hosted by the deployment and transformer will be doing that on fly

Add routes permission in role and CSV

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

Includes tests (if functionality changed/added)
Includes docs (if user facing)
Commit messages follow commit message best practices

See the contribution guide for more details.

Release Notes

Make ConsoleCLiDownload supply binaries from local

tekton-robot · 2021-10-13T08:08:58Z

The following is the coverage report on the affected files.
Say /test pull-tekton-operator-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage
pkg/reconciler/openshift/tektonaddon/controller.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/extension.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/tektonaddon.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/transformer.go	Do not exist	33.3%

tekton-robot · 2021-10-13T08:18:13Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [vdemeester]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

cmd/openshift/operator/kodata/tekton-addon/1.5.0/addons/05-tkncliserve/tkn_cli_serve.yaml

pkg/reconciler/openshift/tektonaddon/transformer_test.go

savitaashture · 2021-10-13T08:28:00Z

pkg/reconciler/openshift/tektonaddon/transformer.go

+		{"Linux", "tkn/tkn-linux-amd64-0.19.1.tar.gz"},
+		{"IBM Power", "tkn/tkn-linux-ppc64le-0.19.1.tar.gz"},
+		{"IBM Z", "tkn/tkn-linux-s390x-0.19.1.tar.gz"},
+		{"Mac", "tkn/tkn-macos-amd64-0.19.1.tar.gz"},
+		{"Windows", "tkn/tkn-windows-amd64-0.19.1.zip"},


how about getting tkn version dynamically instead of hardcoding it here

this is the version which have signed binaries, I am not sure how to get those dynamically

but we can use a constant and then use it in there, so whenever we have to change the binary version we do not have to change everywhere

Suggested change

{"Linux", "tkn/tkn-linux-amd64-0.19.1.tar.gz"},

{"IBM Power", "tkn/tkn-linux-ppc64le-0.19.1.tar.gz"},

{"IBM Z", "tkn/tkn-linux-s390x-0.19.1.tar.gz"},

{"Mac", "tkn/tkn-macos-amd64-0.19.1.tar.gz"},

{"Windows", "tkn/tkn-windows-amd64-0.19.1.zip"},

const Version = "0.19.1"

platforms := []struct {

label string

key string

}{

{"Linux for x86_64", "tkn/tkn-linux-amd64-"+Version+".tar.gz"},

{"Linux for IBM Power", "tkn/tkn-linux-ppc64le-"+Version+".tar.gz"},

{"Linux for IBM Z", "tkn/tkn-linux-s390x-"+Version+".tar.gz"},

{"Mac for x86_64", "tkn/tkn-macos-amd64-"+Version+".tar.gz"},

{"Windows for x86_64", "tkn/tkn-windows-amd64-"+Version+".zip"},

}

we can read that version from deployment env, so everytime we can update in CSV similar to images

I think this should be handled using a configMap. These links dependent on an external system (the binaries copied in the dist-git server build). if we can capture this data in ta configMap, with platform keys and the url fragment as value, then we can replace the values in config map outside of an operator buidl. ie, we will not have to make a version bump pr to this repo.

in otherwords, this is a detail which will change based on release branches, so it will be the part of release-scripts/pipelines to edit the placehoder values we mention in this configmap.

🧑‍💻 i think we can merge this as it is for now as we are on a short schedule.

@piyush-garg could you create an issue, so that we can handle this in a later pr.

tekton-robot · 2021-10-13T08:33:46Z

The following is the coverage report on the affected files.
Say /test pull-tekton-operator-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage
pkg/reconciler/openshift/tektonaddon/controller.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/extension.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/tektonaddon.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/transformer.go	Do not exist	33.3%

pkg/reconciler/openshift/tektonaddon/extension.go

tekton-robot · 2021-10-13T10:01:18Z

The following is the coverage report on the affected files.
Say /test pull-tekton-operator-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage
pkg/reconciler/openshift/tektonaddon/controller.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/extension.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/tektonaddon.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/transformer.go	Do not exist	33.3%

cmd/openshift/operator/kodata/tekton-addon/1.5.0/addons/05-tkncliserve/tkn_cli_serve.yaml

nikhil-thomas · 2021-10-13T12:07:48Z

LGTM

This will add a deployment in OpenShift addon which will serve all the binaries of tkn CLI and installed through installerset then another installerset will run after the previous is completely run to install ConsoleCLIDownload which will have the links to the binaries hosted by the deployment and transformer will be doing that on fly Add routes permission in role and CSV Add the env in csv for image replacement and added the transformer for imagereplacement in tektonaddon

piyush-garg · 2021-10-13T12:13:06Z

Added the part for image replacement also. added the env and transformer in tektonaddon.

tekton-robot · 2021-10-13T12:15:53Z

The following is the coverage report on the affected files.
Say /test pull-tekton-operator-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage
pkg/reconciler/openshift/tektonaddon/controller.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/extension.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/tektonaddon.go	Do not exist	0.0%
pkg/reconciler/openshift/tektonaddon/transformer.go	Do not exist	33.3%

sm43 · 2021-10-14T03:34:50Z

/lgtm
/meow

tekton-robot · 2021-10-14T03:34:51Z

@sm43:

Details

In response to this:

/lgtm
/meow

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Oct 13, 2021

tekton-robot requested review from pradeepitm12 and sm43 October 13, 2021 08:05

tekton-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 13, 2021

vdemeester approved these changes Oct 13, 2021

View reviewed changes

tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 13, 2021

savitaashture reviewed Oct 13, 2021

View reviewed changes

cmd/openshift/operator/kodata/tekton-addon/1.5.0/addons/05-tkncliserve/tkn_cli_serve.yaml Show resolved Hide resolved

vinamra28 reviewed Oct 13, 2021

View reviewed changes

pkg/reconciler/openshift/tektonaddon/transformer_test.go Outdated Show resolved Hide resolved

savitaashture reviewed Oct 13, 2021

View reviewed changes

piyush-garg force-pushed the serve_tkn_updates branch from c0480c0 to a6852f9 Compare October 13, 2021 08:29

sm43 suggested changes Oct 13, 2021

View reviewed changes

pkg/reconciler/openshift/tektonaddon/extension.go Outdated Show resolved Hide resolved

piyush-garg force-pushed the serve_tkn_updates branch from a6852f9 to 4d6591f Compare October 13, 2021 09:57

nikhil-thomas reviewed Oct 13, 2021

View reviewed changes

cmd/openshift/operator/kodata/tekton-addon/1.5.0/addons/05-tkncliserve/tkn_cli_serve.yaml Show resolved Hide resolved

nikhil-thomas reviewed Oct 13, 2021

View reviewed changes

cmd/openshift/operator/kodata/tekton-addon/1.5.0/addons/05-tkncliserve/tkn_cli_serve.yaml Outdated Show resolved Hide resolved

piyush-garg force-pushed the serve_tkn_updates branch from 4d6591f to 9249ffa Compare October 13, 2021 12:12

tekton-robot assigned sm43 Oct 14, 2021

tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 14, 2021

tekton-robot merged commit f600b95 into tektoncd:main Oct 14, 2021

-		{"Linux", "tkn/tkn-linux-amd64-0.19.1.tar.gz"},
-		{"IBM Power", "tkn/tkn-linux-ppc64le-0.19.1.tar.gz"},
-		{"IBM Z", "tkn/tkn-linux-s390x-0.19.1.tar.gz"},
-		{"Mac", "tkn/tkn-macos-amd64-0.19.1.tar.gz"},
-		{"Windows", "tkn/tkn-windows-amd64-0.19.1.zip"},
+               const Version = "0.19.1"
+		platforms := []struct {
+		label string
+		key   string
+	}{
+		{"Linux for x86_64", "tkn/tkn-linux-amd64-"+Version+".tar.gz"},
+		{"Linux for IBM Power", "tkn/tkn-linux-ppc64le-"+Version+".tar.gz"},
+		{"Linux for IBM Z", "tkn/tkn-linux-s390x-"+Version+".tar.gz"},
+		{"Mac for x86_64", "tkn/tkn-macos-amd64-"+Version+".tar.gz"},
+		{"Windows for x86_64", "tkn/tkn-windows-amd64-"+Version+".zip"},
+	}

Make ConsoleCLiDownload supply binaries from local #447

Make ConsoleCLiDownload supply binaries from local #447

Uh oh!

Conversation

piyush-garg commented Oct 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Submitter Checklist

Release Notes

Uh oh!

tekton-robot commented Oct 13, 2021

Uh oh!

tekton-robot commented Oct 13, 2021

Uh oh!

Uh oh!

Uh oh!

savitaashture Oct 13, 2021

Choose a reason for hiding this comment

Uh oh!

rupalibehera Oct 13, 2021

Choose a reason for hiding this comment

Uh oh!

rupalibehera Oct 13, 2021

Choose a reason for hiding this comment

Uh oh!

sm43 Oct 13, 2021

Choose a reason for hiding this comment

Uh oh!

nikhil-thomas Oct 13, 2021

Choose a reason for hiding this comment

Uh oh!

tekton-robot commented Oct 13, 2021

Uh oh!

Uh oh!

tekton-robot commented Oct 13, 2021

Uh oh!

Uh oh!

Uh oh!

nikhil-thomas commented Oct 13, 2021

Uh oh!

piyush-garg commented Oct 13, 2021

Uh oh!

tekton-robot commented Oct 13, 2021

Uh oh!

sm43 commented Oct 14, 2021

Uh oh!

tekton-robot commented Oct 14, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

piyush-garg commented Oct 13, 2021 •

edited

Loading