From a8a667845ca61877e67eb7583d03c06f6af28908 Mon Sep 17 00:00:00 2001 From: Kanika Rana Date: Mon, 18 Mar 2024 16:49:04 -0400 Subject: [PATCH 1/2] crd changes from running make generate --- config/crd/bases/toolchain.dev.openshift.com_idlers.yaml | 3 +-- .../toolchain.dev.openshift.com_memberoperatorconfigs.yaml | 3 +-- .../crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml | 3 +-- .../crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml | 3 +-- .../toolchain.dev.openshift.com_spacebindingrequests.yaml | 3 +-- .../crd/bases/toolchain.dev.openshift.com_spacerequests.yaml | 3 +-- .../bases/toolchain.dev.openshift.com_toolchainclusters.yaml | 3 +-- config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml | 3 +-- config/crd/bases/toolchain.dev.openshift.com_workspaces.yaml | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/config/crd/bases/toolchain.dev.openshift.com_idlers.yaml b/config/crd/bases/toolchain.dev.openshift.com_idlers.yaml index d151c0b3..a9eefde1 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_idlers.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_idlers.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: idlers.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml b/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml index d9b1c94a..e5f5529c 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: memberoperatorconfigs.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml b/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml index 26cd3c6b..fecc45f9 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: memberstatuses.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml b/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml index 3d25a8fd..9c10028b 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: nstemplatesets.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_spacebindingrequests.yaml b/config/crd/bases/toolchain.dev.openshift.com_spacebindingrequests.yaml index b88e35d6..be9e8c74 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_spacebindingrequests.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_spacebindingrequests.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: spacebindingrequests.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_spacerequests.yaml b/config/crd/bases/toolchain.dev.openshift.com_spacerequests.yaml index b187c6ef..dae6c4bb 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_spacerequests.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_spacerequests.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: spacerequests.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml index 247bba32..35486921 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: toolchainclusters.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml b/config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml index 8f1ef7249..4c83214d 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_useraccounts.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: useraccounts.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com diff --git a/config/crd/bases/toolchain.dev.openshift.com_workspaces.yaml b/config/crd/bases/toolchain.dev.openshift.com_workspaces.yaml index df3ee00b..9cce46a1 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_workspaces.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_workspaces.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: workspaces.toolchain.dev.openshift.com spec: group: toolchain.dev.openshift.com From 8fa707d384bae9ceb1d604ad873612979502a4f2 Mon Sep 17 00:00:00 2001 From: Kanika Rana Date: Wed, 13 Nov 2024 23:32:50 -0500 Subject: [PATCH 2/2] updates from make generate --- ...v.openshift.com_memberoperatorconfigs.yaml | 25 +++----- ...hain.dev.openshift.com_memberstatuses.yaml | 21 ++++--- ...hain.dev.openshift.com_nstemplatesets.yaml | 62 +++++++++++++++++++ ...n.dev.openshift.com_toolchainclusters.yaml | 43 +++++-------- 4 files changed, 97 insertions(+), 54 deletions(-) diff --git a/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml b/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml index e5f5529c..4a51d4c9 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_memberoperatorconfigs.yaml @@ -46,6 +46,10 @@ spec: autoscaler: description: Keeps parameters concerned with the autoscaler properties: + bufferCPU: + description: Represents how much CPU should be required by the + autoscaler buffer + type: string bufferMemory: description: Represents how much memory should be required by the autoscaler buffer @@ -145,29 +149,14 @@ spec: description: Defines the timeout for each health check type: string type: object - webConsolePlugin: - description: WebConsolePlugin is used to configure the Web Console - Plugin parameters - properties: - deploy: - description: Deploy determines whether the plugin will be deployed - or not - type: boolean - pendoHost: - description: PendoHost allows a host URL to be configured instead - of communicating directly with the Pendo domain - type: string - pendoKey: - description: PendoKey is the key value used to interact with the - Pendo API - type: string - type: object webhook: description: Keeps parameters concerned with the webhook properties: deploy: description: Defines the flag that determines whether to deploy - the Webhook + the Webhook. If the deploy flag is set to False and the Webhook + was deployed previously it will be deleted by the memberoperatorconfig + controller. type: boolean secret: description: Defines all secrets related to webhook configuration diff --git a/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml b/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml index fecc45f9..fa360c4b 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml @@ -165,21 +165,23 @@ spec: description: HostConnection is the status of the connection with the host cluster properties: + apiEndpoint: + description: APIEndpoint is the API endpoint of the remote cluster. + This can be a hostname, hostname:port, IP or IP:port. + type: string conditions: description: Conditions is an array of current cluster conditions. items: - description: ToolchainClusterCondition describes current state - of a cluster. properties: - lastProbeTime: - description: Last time the condition was checked. - format: date-time - type: string lastTransitionTime: description: Last time the condition transit from one status to another. format: date-time type: string + lastUpdatedTime: + description: Last time the condition was updated + format: date-time + type: string message: description: Human readable message indicating details about last transition. @@ -192,15 +194,18 @@ spec: Unknown. type: string type: - description: Type of cluster condition, Ready or Offline. + description: Type of condition type: string required: - - lastProbeTime - status - type type: object type: array x-kubernetes-list-type: atomic + operatorNamespace: + description: OperatorNamespace is the namespace in which the operator + runs in the remote cluster + type: string required: - conditions type: object diff --git a/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml b/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml index 9c10028b..87ae85c3 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml @@ -107,6 +107,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' @@ -142,6 +154,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. @@ -159,6 +196,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 diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml index 35486921..f62c1b7a 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml @@ -42,26 +42,9 @@ spec: spec: description: ToolchainClusterSpec defines the desired state of ToolchainCluster properties: - apiEndpoint: - description: The API endpoint of the member cluster. This can be a - hostname, hostname:port, IP or IP:port. - type: string - caBundle: - description: CABundle contains the certificate authority information. - type: string - disabledTLSValidations: - description: DisabledTLSValidations defines a list of checks to ignore - when validating the TLS connection to the member cluster. This - can be any of *, SubjectName, or ValidityPeriod. If * is specified, - it is expected to be the only option in list. - items: - type: string - type: array - x-kubernetes-list-type: set secretRef: - description: Name of the secret containing the token required to access - the member cluster. The secret needs to exist in the same namespace - as the control plane and should have a "token" key. + description: Name of the secret containing the kubeconfig required + to connect to the cluster. properties: name: description: Name of a secret within the enclosing namespace @@ -70,28 +53,29 @@ spec: - name type: object required: - - apiEndpoint - secretRef type: object status: description: ToolchainClusterStatus contains information about the current status of a cluster updated periodically by cluster controller. properties: + apiEndpoint: + description: APIEndpoint is the API endpoint of the remote cluster. + This can be a hostname, hostname:port, IP or IP:port. + type: string conditions: description: Conditions is an array of current cluster conditions. items: - description: ToolchainClusterCondition describes current state of - a cluster. properties: - lastProbeTime: - description: Last time the condition was checked. - format: date-time - type: string lastTransitionTime: description: Last time the condition transit from one status to another. format: date-time type: string + lastUpdatedTime: + description: Last time the condition was updated + format: date-time + type: string message: description: Human readable message indicating details about last transition. @@ -103,15 +87,18 @@ spec: description: Status of the condition, one of True, False, Unknown. type: string type: - description: Type of cluster condition, Ready or Offline. + description: Type of condition type: string required: - - lastProbeTime - status - type type: object type: array x-kubernetes-list-type: atomic + operatorNamespace: + description: OperatorNamespace is the namespace in which the operator + runs in the remote cluster + type: string required: - conditions type: object