Merge remote-tracking branch 'upstream/master' into deprecate-tc-spec…

…-fields-contd

# Conflicts:
#	go.mod
#	go.sum

CODEOWNERS

@@ -1 +1 @@
-* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @sbryzak @mfrancisc
+* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @mfrancisc

config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml

@@ -108,6 +108,18 @@ spec:
           status:
             description: NSTemplateSetStatus defines the observed state of NSTemplateSet
             properties:
+              clusterResources:
+                description: The cluster resources template (for cluster-wide quotas,
+                  etc.) that was used last time to provision the NSTemplateSet CR
+                properties:
+                  templateRef:
+                    description: TemplateRef The name of the TierTemplate resource
+                      which exists in the host cluster and which contains the template
+                      to use
+                    type: string
+                required:
+                - templateRef
+                type: object
               conditions:
                 description: 'Conditions is an array of current NSTemplateSet conditions
                   Supported condition types: ConditionReady'
@@ -143,6 +155,31 @@ spec:
                 x-kubernetes-list-map-keys:
                 - type
                 x-kubernetes-list-type: map
+              featureToggles:
+                description: FeatureToggles holds the list of feature toggles/flags
+                  that were enabled when the NSTemplateSet CR was provisioned for
+                  the last time
+                items:
+                  type: string
+                type: array
+                x-kubernetes-list-type: atomic
+              namespaces:
+                description: The namespace templates that were used last time to provision
+                  NSTemplateSet CR
+                items:
+                  description: NSTemplateSetNamespace the namespace definition in
+                    an NSTemplateSet resource
+                  properties:
+                    templateRef:
+                      description: TemplateRef The name of the TierTemplate resource
+                        which exists in the host cluster and which contains the template
+                        to use
+                      type: string
+                  required:
+                  - templateRef
+                  type: object
+                type: array
+                x-kubernetes-list-type: atomic
               provisionedNamespaces:
                 description: ProvisionedNamespaces is a list of Namespaces that were
                   provisioned by the NSTemplateSet.
@@ -160,6 +197,31 @@ spec:
                   type: object
                 type: array
                 x-kubernetes-list-type: atomic
+              spaceRoles:
+                description: The SpaceRole template and the users to whom the template
+                  was applied for when the NSTemplateSet CR was provisioned for the
+                  last time
+                items:
+                  description: NSTemplateSetSpaceRole the role template and the users
+                    to whom the templates should be applied to
+                  properties:
+                    templateRef:
+                      description: TemplateRef The name of the TierTemplate resource
+                        which exists in the host cluster and which contains the template
+                        to use
+                      type: string
+                    usernames:
+                      description: Usernames the usernames to which the template applies
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                  required:
+                  - templateRef
+                  - usernames
+                  type: object
+                type: array
+                x-kubernetes-list-type: atomic
             type: object
         type: object
         x-kubernetes-preserve-unknown-fields: true

config/manager/manager.yaml

@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   labels:
     control-plane: controller-manager
+    kubesaw-control-plane: kubesaw-controller-manager
   name: system
 ---
 apiVersion: apps/v1
@@ -12,17 +13,20 @@ metadata:
   namespace: system
   labels:
     control-plane: controller-manager
+    kubesaw-control-plane: kubesaw-controller-manager
   annotations:
     kubectl.kubernetes.io/default-container: manager
 spec:
   selector:
     matchLabels:
       control-plane: controller-manager
+      kubesaw-control-plane: kubesaw-controller-manager
   replicas: 1
   template:
     metadata:
       labels:
         control-plane: controller-manager
+        kubesaw-control-plane: kubesaw-controller-manager
     spec:
       securityContext:
         runAsNonRoot: true

go.mod

@@ -1,7 +1,7 @@
 module github.com/codeready-toolchain/member-operator
 
 require (
-	github.com/codeready-toolchain/api v0.0.0-20240909145803-3b27dcfb3ded
+	github.com/codeready-toolchain/api v0.0.0-20240927104325-b5bfcb3cb1b0
 	github.com/codeready-toolchain/toolchain-common v0.0.0-20240905135929-d55d86fdd41e
 	github.com/go-logr/logr v1.2.3
 	github.com/google/go-cmp v0.5.9

make/go.mk

@@ -38,7 +38,7 @@ generate-assets: go-bindata
 
 .PHONY: verify-dependencies
 ## Runs commands to verify after the updated dependecies of toolchain-common/API(go mod replace), if the repo needs any changes to be made
-verify-dependencies: generate-assets tidy vet build test lint-go-code
+verify-dependencies: tidy vet build test lint-go-code
 
 .PHONY: tidy
 tidy: 
@@ -47,3 +47,7 @@ tidy:
 .PHONY: vet
 vet:
 	go vet ./...
+
+.PHONY: pre-verify
+pre-verify: generate-assets
+	echo "Pre-requisite completed"