feat: create tiertemplaterevision for each tiertemplate #1103

mfrancisc · 2024-11-12T08:50:12Z

This PR introduces creation of TierTemplateRevision CRs for each TierTemplate, as soon as this is merged we should not see any TTR, we will start seeing those in host namespace only when we populate TierTemplate.Spec.TemplateObjects field.

With the current logic the TTRs are created only when there is a new TierTemplate ( thus one per TierTemplate ) with the TierTemplate.Spec.TemplateObjects field populated. The TTRs are not used yet, thus they will not guide the creation/update/deletion of user namespace content.

In follow up PRs we will introduce comparison between TierTemplate and TierTemplateRevision and usage of TierTemplateRevisions for driving space provisioning.

Jira: https://issues.redhat.com/browse/KUBESAW-146
Paired with: codeready-toolchain/toolchain-e2e#1061

test/nstemplatetier/assertion.go

mfrancisc · 2025-01-15T14:59:16Z

/retest

maybe flaky cleanup: https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/codeready-toolchain_host-operator/1103/pull-ci-codeready-toolchain-host-operator-master-e2e/1879479467613622272/build-log.txt

MatousJobanek · 2025-01-15T15:30:43Z

from the TTR resource:

ObjectMeta: (v1.ObjectMeta) &ObjectMeta{Name:ttr,GenerateName:,Namespace:toolchain-host-15114753,SelfLink:,UID:c11220e5-e326-4ac2-a5a9-9aaea92cbe50,ResourceVersion:62162,Generation:1,CreationTimestamp:2025-01-15 12:03:13 +0000 UTC,DeletionTimestamp:<nil>,DeletionGracePeriodSeconds:nil,Labels:map[string]string{producer: toolchain-e2e,},Annotations:map[string]string{},OwnerReferences:[]OwnerReference{},Finalizers:[],ManagedFields:[]ManagedFieldsEntry{ManagedFieldsEntry{Manager:Go-http-client,Operation:Update,APIVersion:toolchain.dev.openshift.com/v1alpha1,Time:2025-01-15 12:03:13 +0000 UTC,FieldsType:FieldsV1,FieldsV1:{"f:metadata":{"f:labels":{".":{},"f:producer":{}}},"f:spec":{".":{},"f:clusterResources":{".":{},"f:templateRef":{}},"f:namespaces":{},"f:parameters":{".":{},"k:{\"name\":\"DEPLOYMENT_QUOTA\"}":{".":{},"f:name":{},"f:value":{}}},"f:spaceRoles":{}}},Subresource:,},},},

it doesn't look like the delete would be actually called for this DeletionTimestamp:<nil>

mfrancisc · 2025-01-16T10:34:14Z

it doesn't look like the delete would be actually called for this DeletionTimestamp:

@MatousJobanek thanks for pointing this out. I'm looking at it, seems like the cleanup is buggy ? But most of the time works 🤔

# Conflicts: # go.mod # go.sum

mfrancisc · 2025-01-16T15:51:20Z

it doesn't look like the delete would be actually called for this DeletionTimestamp:

It's strange because that is actually the custom NSTemplateTier I create here with cleanup https://github.com/codeready-toolchain/toolchain-e2e/pull/1061/files#diff-d1f261f3430b9095a3c1639d087ee7fdb0c4a33756c21552ed0a53095c7d9326R412

and the deletion should be triggered here https://github.com/codeready-toolchain/toolchain-e2e/pull/1061/files#diff-9f3717e8440a5df617b514735733d446cd593f05131365e355488105d9f0aa91R115

mfrancisc · 2025-01-16T16:01:12Z

this one looks more like infra/rgsvc glitch :

  signup_request.go:352: 
        	Error Trace:	/tmp/toolchain-e2e/testsupport/signup_request.go:352
        	            				/tmp/toolchain-e2e/testsupport/signup_request.go:244
        	            				/tmp/toolchain-e2e/testsupport/user_setup.go:43
        	            				/tmp/toolchain-e2e/testsupport/user_setup.go:50
        	            				/tmp/toolchain-e2e/test/e2e/parallel/e2e_test.go:70
        	Error:      	Not equal: 
        	            	expected: 202
        	            	actual  : 502
        	Test:       	TestE2EFlow
        	Messages:   	unexpected response status with body: <html><body><h1>502 Bad Gateway</h1>
        	            	The server returned an invalid or incomplete response.

/retest

metlos

some additional comments.

controllers/nstemplatetier/nstemplatetier_controller.go

controllers/nstemplatetier/nstemplatetier_controller_test.go

test/tiertemplaterevision/assertion.go

mfrancisc · 2025-01-17T11:15:16Z

/retest

infra

# Conflicts: # go.mod # go.sum

mfrancisc · 2025-01-20T12:14:36Z

I'm confused 😕

It failed again with NSTemplateTier not being deleted after the tests:

clean.go:169: 
        	Error Trace:	/tmp/toolchain-e2e/testsupport/cleanup/clean.go:169
        	            				/usr/local/go/src/sync/once.go:74
        	            				/usr/local/go/src/sync/once.go:65
        	            				/tmp/toolchain-e2e/testsupport/cleanup/clean.go:92
        	            				/tmp/toolchain-e2e/testsupport/cleanup/clean.go:76
        	            				/usr/local/go/src/runtime/asm_amd64.s:1598
        	Error:      	Received unexpected error:
        	            	context deadline exceeded
        	Test:       	TestTierTemplateRevision
        	Messages:   	The object still exists after the time out expired: (*v1alpha1.NSTemplateTier)(0xc0011f2300)({
        	            	 TypeMeta: (v1.TypeMeta) &TypeMeta{Kind:,APIVersion:,},
        	            	 ObjectMeta: (v1.ObjectMeta) &ObjectMeta{Name:ttr,GenerateName:,Namespace:toolchain-host-20105331,SelfLink:,UID:8ed926ee-d5b5-4973-aee1-c39b9451a6cd,ResourceVersion:61815,Generation:1,CreationTimestamp:2025-01-20 11:08:51 +0000 UTC,DeletionTimestamp:<nil>,DeletionGracePeriodSeconds:nil,Labels:map[string]string{producer: toolchain-e2e,},Annotations:map[string]string{},OwnerReferences:[]OwnerReference{},Finalizers:[],ManagedFields:[]ManagedFieldsEntry{ManagedFieldsEntry{Manager:Go-http-client,Operation:Update,APIVersion:toolchain.dev.openshift.com/v1alpha1,Time:2025-01-20 11:08:51 +0000 UTC,FieldsType:FieldsV1,FieldsV1:{"f:metadata":{"f:labels":{".":{},"f:producer":{}}},"f:spec":{".":{},"f:clusterResources":{".":{},"f:templateRef":{}},"f:namespaces":{},"f:parameters":{".":{},"k:{\"name\":\"DEPLOYMENT_QUOTA\"}":{".":{},"f:name":{},"f:value":{}}},"f:spaceRoles":{}}},Subresource:,},},},
        	            	 Spec: (v1alpha1.NSTemplateTierSpec) {
        	            	  Namespaces: ([]v1alpha1.NSTemplateTierNamespace) (len=1 cap=1) {
        	            	   (v1alpha1.NSTemplateTierNamespace) {
        	            	    TemplateRef: (string) (len=34) "ttrfrombase1ns-dev-d3c2c60-d3c2c60"
        	            	   }
        	            	  },
        	            	  ClusterResources: (*v1alpha1.NSTemplateTierClusterResources)(0xc000a8e4e0)({
        	            	   TemplateRef: (string) (len=47) "ttrfrombase1ns-clusterresources-5b0d541-5b0d541"
        	            	  }),
        	            	  SpaceRoles: (map[string]v1alpha1.NSTemplateTierSpaceRole) (len=1) {
        	            	   (string) (len=5) "admin": (v1alpha1.NSTemplateTierSpaceRole) {
        	            	    TemplateRef: (string) (len=36) "ttrfrombase1ns-admin-88b275d-88b275d"
        	            	   }
        	            	  },
        	            	  SpaceRequestConfig: (*v1alpha1.SpaceRequestConfig)(<nil>),
        	            	  Parameters: ([]v1alpha1.Parameter) (len=1 cap=1) {
        	            	   (v1alpha1.Parameter) {
        	            	    Name: (string) (len=16) "DEPLOYMENT_QUOTA",
        	            	    Value: (string) (len=2) "60"
        	            	   }
        	            	  }
        	            	 },
        	            	 Status: (v1alpha1.NSTemplateTierStatus) {
        	            	  Conditions: ([]v1alpha1.Condition) <nil>,
        	            	  Revisions: (map[string]string) <nil>
        	            	 }
        	            	})

but from the logs it does seem that the deletion was triggered:

clean.go:114: deleting NSTemplateTier: ttr ...

mfrancisc · 2025-01-20T15:42:02Z

/retest

updated e2e

mfrancisc · 2025-01-21T09:17:01Z

/retest

sonarqubecloud · 2025-01-21T12:55:30Z

Quality Gate passed

Issues
6 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

openshift-ci · 2025-01-21T15:14:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fbm3307, MatousJobanek, metlos, mfrancisc

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~~ [MatousJobanek,fbm3307,metlos,mfrancisc]

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

codecov · 2025-01-23T06:21:21Z

Codecov Report

Attention: Patch coverage is 91.59292% with 19 lines in your changes missing coverage. Please review.

Project coverage is 79.64%. Comparing base (8d4a501) to head (311a835).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
...ollers/nstemplatetier/nstemplatetier_controller.go	84.55%	14 Missing and 5 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1103      +/-   ##
==========================================
+ Coverage   79.10%   79.64%   +0.54%     
==========================================
  Files          78       79       +1     
  Lines        7830     8043     +213     
==========================================
+ Hits         6194     6406     +212     
+ Misses       1456     1452       -4     
- Partials      180      185       +5

Files with missing lines	Coverage Δ
test/nstemplatetier/assertion.go	`100.00% <100.00%> (ø)`
test/nstemplatetier/nstemplatetier.go	`74.49% <100.00%> (+11.76%)`	⬆️
test/tiertemplaterevision/assertion.go	`100.00% <100.00%> (ø)`
...ollers/nstemplatetier/nstemplatetier_controller.go	`83.09% <84.55%> (+25.95%)`	⬆️

mfrancisc and others added 22 commits December 7, 2023 12:21

remove spacebinding request migration controller

8d24435

Merge branch 'master' of github.com:mfrancisc/host-operator

a25fb02

Merge branch 'master' of github.com:mfrancisc/host-operator

fd840c6

Merge branch 'master' of github.com:mfrancisc/host-operator

0221d40

Merge branch 'master' of github.com:mfrancisc/host-operator

0f4717d

Merge branch 'master' of github.com:mfrancisc/host-operator

0977ae6

Merge branch 'master' of github.com:mfrancisc/host-operator

7aa35c5

Merge branch 'master' of github.com:mfrancisc/host-operator

d09f3b8

Merge branch 'master' of github.com:mfrancisc/host-operator

79c20ca

Merge branch 'master' of github.com:mfrancisc/host-operator

b21f39f

Merge branch 'master' of github.com:mfrancisc/host-operator

b0aea00

Merge branch 'master' of github.com:mfrancisc/host-operator

e9e35bc

Merge branch 'master' of github.com:mfrancisc/host-operator

969562e

Merge branch 'master' of github.com:mfrancisc/host-operator

344bc04

Merge branch 'master' of github.com:mfrancisc/host-operator

ea71877

Merge branch 'master' of github.com:mfrancisc/host-operator

ef294f7

Merge branch 'master' of github.com:mfrancisc/host-operator

1f8d51d

create TTR

9a42d87

Merge branch 'master' of github.com:mfrancisc/host-operator

b27cde7

Merge branch 'master' into createttr

eabc92f

create TTR only if TierTemplate.Spec.TemplateObjects field is set.

a5fd29a

add owner reference on ttrs

53d3cc1

mfrancisc requested review from MatousJobanek, xcoulon, alexeykazakov, rajivnathan and ranakan19 as code owners November 12, 2024 08:50

openshift-ci bot added the approved label Nov 12, 2024

mfrancisc mentioned this pull request Nov 12, 2024

feat: create tiertemplaterevision for each tiertemplate codeready-toolchain/toolchain-e2e#1061

Merged

fix linter

8571495

fbm3307 approved these changes Jan 15, 2025

View reviewed changes

test/nstemplatetier/assertion.go Outdated Show resolved Hide resolved

Devtools added 2 commits January 15, 2025 11:42

fix linter

0729bd4

fix linter

6d72c89

Devtools and others added 3 commits January 16, 2025 11:52

Merge branch 'master' of github.com:mfrancisc/host-operator

d844c83

Merge branch 'master' into createttr

0ebf1df

# Conflicts: # go.mod # go.sum

Merge branch 'master' into createttr

55135d1

metlos reviewed Jan 16, 2025

View reviewed changes

address pr comments

e00a40e

mfrancisc requested a review from metlos January 17, 2025 07:20

Devtools and others added 3 commits January 17, 2025 12:54

Merge branch 'master' of github.com:mfrancisc/host-operator

a08f667

Merge branch 'master' into createttr

c6b8f7b

# Conflicts: # go.mod # go.sum

Merge branch 'master' into createttr

9213912

Devtools and others added 2 commits January 21, 2025 10:17

Empty-Commit

2c03b7b

Merge branch 'master' into createttr

311a835

metlos approved these changes Jan 21, 2025

View reviewed changes

mfrancisc merged commit a1bcf67 into codeready-toolchain:master Jan 23, 2025
12 of 13 checks passed

mfrancisc deleted the createttr branch January 23, 2025 06:21

mfrancisc mentioned this pull request Jan 24, 2025

feat: create new ttr for tiertemplate updates #1130

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: create tiertemplaterevision for each tiertemplate #1103

feat: create tiertemplaterevision for each tiertemplate #1103

mfrancisc commented Nov 12, 2024 •

edited

Loading

mfrancisc commented Jan 15, 2025

MatousJobanek commented Jan 15, 2025

mfrancisc commented Jan 16, 2025

mfrancisc commented Jan 16, 2025

mfrancisc commented Jan 16, 2025 •

edited

Loading

metlos left a comment

mfrancisc commented Jan 17, 2025

mfrancisc commented Jan 20, 2025

mfrancisc commented Jan 20, 2025

mfrancisc commented Jan 21, 2025

sonarqubecloud bot commented Jan 21, 2025

openshift-ci bot commented Jan 21, 2025

codecov bot commented Jan 23, 2025

feat: create tiertemplaterevision for each tiertemplate #1103

feat: create tiertemplaterevision for each tiertemplate #1103

Conversation

mfrancisc commented Nov 12, 2024 • edited Loading

mfrancisc commented Jan 15, 2025

MatousJobanek commented Jan 15, 2025

mfrancisc commented Jan 16, 2025

mfrancisc commented Jan 16, 2025

mfrancisc commented Jan 16, 2025 • edited Loading

metlos left a comment

Choose a reason for hiding this comment

mfrancisc commented Jan 17, 2025

mfrancisc commented Jan 20, 2025

mfrancisc commented Jan 20, 2025

mfrancisc commented Jan 21, 2025

sonarqubecloud bot commented Jan 21, 2025

Quality Gate passed

openshift-ci bot commented Jan 21, 2025

codecov bot commented Jan 23, 2025

Codecov Report

mfrancisc commented Nov 12, 2024 •

edited

Loading

mfrancisc commented Jan 16, 2025 •

edited

Loading