RHTAPINST-49: OpenShift Pipelines Configuration #44

otaviof · 2024-06-24T09:11:05Z

Moving the Tekton Chains configuration to the infrastructure chart, replacing the pre-deploy hook with a post-deploy job that will create the Tekton Chains resources.

Improved the Helm chart testing to wait for OpenShift Pipelines to be ready, and using official Chainguard images to run cosign.

After #43 and #42 🙏

charts/rhtap-infrastructure/templates/openshift-pipelines/job-tekton-chains.yaml

charts/rhtap-infrastructure/templates/openshift-pipelines/job-tekton-config.yaml

Roming22 · 2024-06-24T13:00:48Z

charts/rhtap-infrastructure/templates/openshift-pipelines/tekton-chains-password.yaml

@@ -0,0 +1,28 @@
+{{- if .Values.infrastructure.openShiftPipelines.enabled }}


This resource feels superfluous.

That's the link with RHDH toggle. So, when RHDH is disabled we can also disable OpenShift Pipelines changes.

Roming22 · 2024-06-24T13:03:03Z

charts/rhtap-infrastructure/values.yaml

+      # Labels to add to the resource.
+      labels: {}
+    # Tekton Chains settings.
+    tektonChains:


This section can go away, I don't see it's value.

That section controls Tekton Chains related settings, and replaces hook scripts. In fact, is quite relevant.

I don't think any of these values are controlled by the user.

These attributes have defaults, they should be good enough to work with the current version of OpenShift Pipelines, and allow us to modify as we move forward. The entries added to the values.yaml are, in fact, variables that we use in multiple resources to avoid duplication, among other reasons to define them.

Additionally, by having these attributes we can leverage their relationship via values.yaml.tpl.

For the record, I moved the defaults to the values.yaml on rhtap-infrastructure instead of setting them up on values.yaml.tpl.

Roming22

Please rebase to simplify the review.

charts/rhtap-infrastructure/templates/openshift-pipelines/job-tekton-config.yaml

Roming22 · 2024-06-24T14:22:28Z

charts/rhtap-infrastructure/values.yaml

+      # Labels to add to the resource.
+      labels: {}
+    # Tekton Chains settings.
+    tektonChains:


I don't think any of these values are controlled by the user.

Roming22 · 2024-06-24T14:23:44Z

charts/values.yaml.tpl

+        meta.helm.sh/release-namespace: {{ $argoCDNamespace }}
+      labels:
+        app.kubernetes.io/managed-by: Helm
+    tektonChains:


Let's discuss tomorrow why that's needed.

It's needed to replace this:

rhtap-cli/charts/rhtap-backing-services/hooks/pre-deploy.sh

Lines 6 to 17 in 2cff2c5

make_helm_managed() {

KIND="$1"

NAMESPACE="$2"

NAME="$3"

echo -n "."

kubectl annotate "$KIND" "$NAME" meta.helm.sh/release-name=rhtap-backing-services >/dev/null

echo -n "."

kubectl annotate "$KIND" "$NAME" meta.helm.sh/release-namespace="$NAMESPACE" >/dev/null

echo -n "."

kubectl label "$KIND" "$NAME" app.kubernetes.io/managed-by=Helm >/dev/null

}

Thus we can run these type of interactions in the cluster, without the need for extra local tools to run rhtap-cli.

konflux-ci-qe-bot · 2024-06-24T14:41:03Z

@otaviof: The following test finished, in case test failed say /retest to rerun all failed tests:

PipelineRun name	Command
rhtap-cli-nt6jt-g6jz8	/retest

To inspect your test artifacts make sure you have installed ORAS in your local machine. To inspect all test artifacts execute:

mkdir -p oras-artifacts
cd oras-artifacts
oras pull quay.io/konflux-qe-incubator/konflux-qe-oci-storage:rhtap-cli-nt6jt-g6jz8

For instructions on how to install ORAS, please refer to the ORAS installation guide.

otaviof · 2024-06-24T15:08:39Z

Please rebase to simplify the review.

Sure! Just rebased, please consider.

konflux-ci-qe-bot · 2024-06-24T16:00:33Z

@otaviof: The following test finished, in case test failed say /retest to rerun all failed tests:

PipelineRun name	Command
rhtap-cli-zkzkj-bzkgz	/retest

To inspect your test artifacts make sure you have installed ORAS in your local machine. To inspect all test artifacts execute:

mkdir -p oras-artifacts
cd oras-artifacts
oras pull quay.io/konflux-qe-incubator/konflux-qe-oci-storage:rhtap-cli-zkzkj-bzkgz

For instructions on how to install ORAS, please refer to the ORAS installation guide.

Moving the Tekton Chains configuration to the infrastructure chart, replacing the pre-deploy hook with a post-deploy job that will create the Tekton Chains resources. Improved the Helm chart testing to wait for OpenShift Pipelines to be ready, and using official Chainguard images to run `cosign.`

konflux-ci-qe-bot · 2024-06-25T08:05:18Z

@otaviof: The following test finished, in case test failed say /retest to rerun all failed tests:

PipelineRun name	Command
rhtap-cli-qrvrp-zfdf6	/retest

To inspect your test artifacts make sure you have installed ORAS in your local machine. To inspect all test artifacts execute:

mkdir -p oras-artifacts
cd oras-artifacts
oras pull quay.io/konflux-qe-incubator/konflux-qe-oci-storage:rhtap-cli-qrvrp-zfdf6

For instructions on how to install ORAS, please refer to the ORAS installation guide.

otaviof assigned Roming22 Jun 24, 2024

otaviof force-pushed the RHTAPINST-49 branch from 656b73c to 6a44bf8 Compare June 24, 2024 12:47

Roming22 force-pushed the RHTAPINST-49 branch from 6a44bf8 to 9fb0557 Compare June 24, 2024 12:48

Roming22 reviewed Jun 24, 2024

View reviewed changes

otaviof force-pushed the RHTAPINST-49 branch from 9fb0557 to 398844e Compare June 24, 2024 13:49

Roming22 reviewed Jun 24, 2024

View reviewed changes

feat: Kubernetes Resource Amend Script

c15755f

otaviof force-pushed the RHTAPINST-49 branch from 398844e to 86718a4 Compare June 24, 2024 15:08

otaviof force-pushed the RHTAPINST-49 branch 2 times, most recently from 5dd954d to 0b596a0 Compare June 24, 2024 15:14

otaviof requested a review from Roming22 June 25, 2024 04:13

otaviof force-pushed the RHTAPINST-49 branch from 0b596a0 to aa2d1ae Compare June 25, 2024 07:16

Roming22 approved these changes Jun 25, 2024

View reviewed changes

Roming22 merged commit 753598d into redhat-appstudio:main Jun 25, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RHTAPINST-49: OpenShift Pipelines Configuration #44

RHTAPINST-49: OpenShift Pipelines Configuration #44

otaviof commented Jun 24, 2024 •

edited

Loading

Roming22 Jun 24, 2024

otaviof Jun 24, 2024

Roming22 Jun 24, 2024

otaviof Jun 24, 2024

Roming22 Jun 24, 2024

otaviof Jun 24, 2024

otaviof Jun 24, 2024

Roming22 left a comment

Roming22 Jun 24, 2024

Roming22 Jun 24, 2024

otaviof Jun 24, 2024

konflux-ci-qe-bot commented Jun 24, 2024

otaviof commented Jun 24, 2024

konflux-ci-qe-bot commented Jun 24, 2024

konflux-ci-qe-bot commented Jun 25, 2024

		@@ -0,0 +1,28 @@
		{{- if .Values.infrastructure.openShiftPipelines.enabled }}

	make_helm_managed() {
	KIND="$1"
	NAMESPACE="$2"
	NAME="$3"

	echo -n "."
	kubectl annotate "$KIND" "$NAME" meta.helm.sh/release-name=rhtap-backing-services >/dev/null
	echo -n "."
	kubectl annotate "$KIND" "$NAME" meta.helm.sh/release-namespace="$NAMESPACE" >/dev/null
	echo -n "."
	kubectl label "$KIND" "$NAME" app.kubernetes.io/managed-by=Helm >/dev/null
	}

RHTAPINST-49: OpenShift Pipelines Configuration #44

RHTAPINST-49: OpenShift Pipelines Configuration #44

Conversation

otaviof commented Jun 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Roming22 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

konflux-ci-qe-bot commented Jun 24, 2024

otaviof commented Jun 24, 2024

konflux-ci-qe-bot commented Jun 24, 2024

konflux-ci-qe-bot commented Jun 25, 2024

otaviof commented Jun 24, 2024 •

edited

Loading