Add telemetry to uni04delta-ipv6 #361

vyzigold · 2024-08-06T20:21:08Z

No description provided.

openshift-ci · 2024-08-06T20:21:13Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

vyzigold · 2024-08-06T20:21:30Z

/test all

abays · 2024-10-07T11:13:14Z

examples/dt/uni04delta-ipv6/control-plane.md

+```bash
+cat > subscription.yaml << EOF
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: observability-operator
+  namespace: openshift-operators
+  labels:
+    operators.coreos.com/observability-operator.openshift-operators: ""
+spec:
+  channel: development
+  installPlanApproval: Automatic
+  name: cluster-observability-operator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+EOF
+
+# Apply the cr
+oc apply -f subscription.yaml
+
+# Wait for the deployment to be ready
+oc wait deployments/observability-operator --for condition=Available \
+    --timeout=300s
+```


In theory this could be handled in this DT's Kustomize templates and could be added as a stage in the associated https://github.com/openstack-k8s-operators/architecture/blob/main/automation/vars/uni04delta-ipv6.yaml

Is it automated elsewhere when you tested it downstream?

I have no objection to this PR otherwise.

++ I would like to see that we try to consolidate on the automation here.

For context, currently observability-operator is installed by deploy-edpm.yml which does ansible.builtin.import_playbook: playbooks/02-infra.yml - the 02-infra.yml includes ci-framework role openshift_obs if cifmw_deploy_obs: true. AFICT only uni01alpha enabled the cifmw_deploy_obs option.

For this change to work, we would have to update the uni04delta-ipv6 job, toggling the same option.

I would rather see we implement it as suggested by Andrew here.

It is automated in the downstream job, but I don't mind moving it here.

I ended up including a yaml file containing the COO subscription and I added that into the control-plane's kustomization.yaml. I hope that works for you. I'll remove the line which deploys COO from the downstream MR and I'll do a recheck on the downstream testproject MR (both MRs depend on this PR) to test everything still works. I'll report back when I see it pass the CI.

hjensas · 2024-10-07T12:24:12Z

dt/uni04delta-ipv6/kustomization.yaml

+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.ironic.template.rpcTransport


I guess touching all these ironic values here is needed to avoid the OpenstackControlPlane update done to enable Ceph do not disable/change ironic config?

Hmm. I don't remember changing anything with ironic. Must be some leftover after a merge conflict and I somehow missed it when going through the PR 🤔 . Thank you for revealing this, I'll delete this and retest with the downstream testproject.

softwarefactory-project-zuul · 2024-10-08T12:33:04Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/928cc3cb5608454cbef64fdab1babe79

✔️ noop SUCCESS in 0s
✔️ rhoso-architecture-validate-uni04delta SUCCESS in 3m 43s
❌ rhoso-architecture-validate-uni04delta-ipv6 FAILURE in 3m 17s

softwarefactory-project-zuul · 2024-10-08T13:27:45Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/80e490889e3548589910c00f8b83aeb6

✔️ noop SUCCESS in 0s
✔️ rhoso-architecture-validate-uni04delta SUCCESS in 3m 43s
❌ rhoso-architecture-validate-uni04delta-ipv6 FAILURE in 3m 13s

Heat has been added by another PR already

abays · 2024-10-14T09:32:02Z

examples/dt/uni04delta-ipv6/control-plane/kustomization.yaml

@@ -4,5 +4,6 @@ kind: Kustomization
 components:
  - ../../../../dt/uni04delta-ipv6
 resources:
+  - coo-sub.yaml


This works to inject the Subscription for COO, because it will get processed here [1]. I do wonder though if it would be cleaner to have a separate stage for it before the control-plane one. It's not a deal-breaker in my opinion, however. Maybe @fultonj and @hjensas have other thoughts.

[1]

architecture/automation/vars/uni04delta-ipv6.yaml

Lines 17 to 28 in 6c766ab

- path: examples/dt/uni04delta-ipv6/control-plane

wait_conditions:

- >-

oc -n openstack wait osctlplane controlplane

--for condition=Ready

--timeout=60m

values:

- name: network-values

src_file: nncp/values.yaml

- name: service-values.yaml

src_file: service-values.yaml

build_output: control-plane.yaml

I think a separate step would be better.

Also, I think we should move the coo-sub.yaml to the library, since this is something that multiple VA/DTs will use? Something in lib/olm-deps, and add the kustomize to apply in examples/common ?

Then the first automation stage for VA/DT's with Telemetry would be to apply path: examples/common/coo-sub? (I think that should work, but we may need to relax the assertions in ci-framework's kustomize_deploy[1] role to allow automation stages without values?)

[1] https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/kustomize_deploy/tasks/execute_step.yml#L10-L11

Those sound like good ideas to me

I like the idea too. I'll see what I can do.

Actually by moving the coo subscription to lib/olm-deps, it'll get picked up by examples/common/olm automatically. I assume that examples/common is used for each dt/va, so this way COO will be installed everywhere. I think that's OK to have it everywhere since it's listed as a dependency in the RHOSO docs and I've seen some efforts of enabling telemetry on all dts. Check it in the latest commit.

I rechecked my testproject downsteam which depends on these changes. It's struggling to deploy the dataplane for quite some time now (I think the hypervisor is running out of resources), but it got far enough to successfully deploy the control plane and I can confirm that this approach for deploying COO worked. I'll reach out once I manage to get a successful run of the testproject.

@hjensas are you ok with this most recent update?

Yes, I think it is fine. We will end up install COO always, but I saw the resource usage was discussed and agreed to be small enough to do it like this.

hjensas · 2024-10-22T08:58:19Z

/lgtm

abays

/lgtm
/approve

openshift-ci · 2024-10-22T10:44:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, vyzigold

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [abays]

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

abays · 2024-10-22T10:45:13Z

/hold

@vyzigold wants a @cjeanner review

softwarefactory-project-zuul · 2024-10-22T10:49:58Z

Build succeeded (gate pipeline).
https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/6ea2d18457114df4a66a266d7c9fffe2

vyzigold · 2024-10-22T13:27:01Z

/hold

@vyzigold wants a @cjeanner review

That's not required. I just saw that I received a LGTM and not an approval. The first message in the PR suggested to add him as a reviewer for approval, so that's what I did. Thanks for the approval. I'm really happy this is finally merged.

vyzigold · 2024-10-22T19:35:45Z

/cherrypick 18.0-fr1

openshift-cherrypick-robot · 2024-10-22T19:36:23Z

@vyzigold: new pull request created: #422

In response to this:

/cherrypick 18.0-fr1

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-sigs/prow repository.

openshift-ci bot added the do-not-merge/work-in-progress label Aug 6, 2024

vyzigold force-pushed the add_telemetry_to_delta branch 5 times, most recently from 396a824 to ab4639d Compare August 12, 2024 13:02

vyzigold force-pushed the add_telemetry_to_delta branch from ab4639d to 2109533 Compare August 21, 2024 13:16

vyzigold force-pushed the add_telemetry_to_delta branch from 2109533 to c57959d Compare September 30, 2024 09:19

vyzigold marked this pull request as ready for review October 4, 2024 16:04

openshift-ci bot removed the do-not-merge/work-in-progress label Oct 4, 2024

openshift-ci bot requested review from karelyatin and leifmadsen October 4, 2024 16:04

vyzigold force-pushed the add_telemetry_to_delta branch from c57959d to ad4aecb Compare October 4, 2024 16:04

abays reviewed Oct 7, 2024

View reviewed changes

hjensas reviewed Oct 7, 2024

View reviewed changes

vyzigold force-pushed the add_telemetry_to_delta branch from 69816c2 to 2371b46 Compare October 8, 2024 14:36

vyzigold added 5 commits October 9, 2024 10:00

Add telemetry to uni04delta-ipv6

a0ad2d3

WA extend keystone token expiration

297494d

Remove ironic changes from PR

d6046ec

Deploy COO in uni04delta-ipv6

d47e236

Fix CI issues

b3726b2

vyzigold force-pushed the add_telemetry_to_delta branch from 2371b46 to b3726b2 Compare October 9, 2024 14:02

Remove heat changes from PR

f6119f1

Heat has been added by another PR already

vyzigold force-pushed the add_telemetry_to_delta branch from 3cc5dae to f6119f1 Compare October 10, 2024 12:44

abays reviewed Oct 14, 2024

View reviewed changes

Move COO deployment to common

1084c9a

abays mentioned this pull request Oct 21, 2024

Enable telemetry in OSASINFRA DT #418

Merged

openshift-ci bot assigned hjensas Oct 22, 2024

openshift-ci bot added the lgtm label Oct 22, 2024

vyzigold requested a review from cjeanner October 22, 2024 09:13

abays approved these changes Oct 22, 2024

View reviewed changes

openshift-ci bot assigned abays Oct 22, 2024

openshift-ci bot added the approved label Oct 22, 2024

openshift-ci bot added the do-not-merge/hold label Oct 22, 2024

softwarefactory-project-zuul bot merged commit a0cf8f9 into openstack-k8s-operators:main Oct 22, 2024
7 checks passed

openshift-cherrypick-robot mentioned this pull request Oct 22, 2024

[18.0-fr1] Add telemetry to uni04delta-ipv6 #422

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add telemetry to uni04delta-ipv6 #361

Add telemetry to uni04delta-ipv6 #361

vyzigold commented Aug 6, 2024

openshift-ci bot commented Aug 6, 2024

vyzigold commented Aug 6, 2024

abays Oct 7, 2024

fultonj Oct 7, 2024

hjensas Oct 7, 2024

vyzigold Oct 8, 2024

vyzigold Oct 8, 2024

hjensas Oct 7, 2024

vyzigold Oct 8, 2024

softwarefactory-project-zuul bot commented Oct 8, 2024

softwarefactory-project-zuul bot commented Oct 8, 2024

abays Oct 14, 2024

hjensas Oct 14, 2024

abays Oct 14, 2024

vyzigold Oct 16, 2024

vyzigold Oct 16, 2024

vyzigold Oct 17, 2024

fultonj Oct 21, 2024

hjensas Oct 22, 2024

hjensas commented Oct 22, 2024

abays left a comment

openshift-ci bot commented Oct 22, 2024

abays commented Oct 22, 2024

softwarefactory-project-zuul bot commented Oct 22, 2024

vyzigold commented Oct 22, 2024

vyzigold commented Oct 22, 2024

openshift-cherrypick-robot commented Oct 22, 2024

	- path: examples/dt/uni04delta-ipv6/control-plane
	wait_conditions:
	- >-
	oc -n openstack wait osctlplane controlplane
	--for condition=Ready
	--timeout=60m
	values:
	- name: network-values
	src_file: nncp/values.yaml
	- name: service-values.yaml
	src_file: service-values.yaml
	build_output: control-plane.yaml

Add telemetry to uni04delta-ipv6 #361

Add telemetry to uni04delta-ipv6 #361

Conversation

vyzigold commented Aug 6, 2024

openshift-ci bot commented Aug 6, 2024

vyzigold commented Aug 6, 2024

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

softwarefactory-project-zuul bot commented Oct 8, 2024

softwarefactory-project-zuul bot commented Oct 8, 2024

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

Choose a reason for hiding this comment

hjensas commented Oct 22, 2024

abays left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Oct 22, 2024

abays commented Oct 22, 2024

softwarefactory-project-zuul bot commented Oct 22, 2024

vyzigold commented Oct 22, 2024

vyzigold commented Oct 22, 2024

openshift-cherrypick-robot commented Oct 22, 2024