diff --git a/go.mod b/go.mod index 949d19100..e137c79c0 100644 --- a/go.mod +++ b/go.mod @@ -15,10 +15,10 @@ require ( github.com/hashicorp/go-plugin v1.6.0 github.com/hashicorp/golang-lru/v2 v2.0.2 github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 - github.com/loft-sh/agentapi/v3 v3.4.0-beta.11.0.20240123094803-669b6def4eb6 + github.com/loft-sh/agentapi/v3 v3.4.0-beta.12.0.20240202135812-bc4ecf58f665 github.com/loft-sh/analytics-client v0.0.0-20231127192707-f76e263f6c83 - github.com/loft-sh/api/v3 v3.0.0-20240123094839-7e1855cd6ad7 - github.com/loft-sh/loftctl/v3 v3.0.0-20240123132211-f09474d1f54c + github.com/loft-sh/api/v3 v3.0.0-20240202135831-33c4357035e6 + github.com/loft-sh/loftctl/v3 v3.0.0-20240202135933-6548c1e817a7 github.com/loft-sh/utils v0.0.29 github.com/loft-sh/vcluster-values v0.0.0-20240202080304-a3a5b74a4bfb github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d @@ -85,8 +85,8 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect github.com/hashicorp/yamux v0.1.1 // indirect github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 // indirect - github.com/loft-sh/admin-apis v0.0.0-20231102064836-7a6574be5f16 // indirect - github.com/loft-sh/apiserver v0.0.0-20240122115656-e1a690b2e2d8 // indirect + github.com/loft-sh/admin-apis v0.0.0-20240202092301-43d989db6f95 // indirect + github.com/loft-sh/apiserver v0.0.0-20240125143607-a106e2f2e0f1 // indirect github.com/loft-sh/jspolicy v0.2.2 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/mitchellh/go-testing-interface v1.0.0 // indirect diff --git a/go.sum b/go.sum index ff7ac2004..f18ea70f2 100644 --- a/go.sum +++ b/go.sum @@ -625,20 +625,20 @@ github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyP github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -github.com/loft-sh/admin-apis v0.0.0-20231102064836-7a6574be5f16 h1:cDdBqGd2OSL9KW8HIhqEagu13VfUibUEfKt9qvdtfgM= -github.com/loft-sh/admin-apis v0.0.0-20231102064836-7a6574be5f16/go.mod h1:MWczNwKvWssHo1KaeZKaWDdRLYSNbWqQBGsTLoCNd7U= -github.com/loft-sh/agentapi/v3 v3.4.0-beta.11.0.20240123094803-669b6def4eb6 h1:HmTMqwL+bkgTjOdEAB9eSTBlf1VP3cbyd/ZL7Tuexik= -github.com/loft-sh/agentapi/v3 v3.4.0-beta.11.0.20240123094803-669b6def4eb6/go.mod h1:Cpyq+ENdPYHWay5OzCWhal4czSBPwr3OtAkVnIbHtSc= +github.com/loft-sh/admin-apis v0.0.0-20240202092301-43d989db6f95 h1:y7Q/pjuM+bze6jnUr2f4SqwCWeMIw9pmhPAyPI6PfBk= +github.com/loft-sh/admin-apis v0.0.0-20240202092301-43d989db6f95/go.mod h1:MWczNwKvWssHo1KaeZKaWDdRLYSNbWqQBGsTLoCNd7U= +github.com/loft-sh/agentapi/v3 v3.4.0-beta.12.0.20240202135812-bc4ecf58f665 h1:1erpg2J5mzmyDZ364yOR/gG1IGofKBItiYoFYZ9pJ80= +github.com/loft-sh/agentapi/v3 v3.4.0-beta.12.0.20240202135812-bc4ecf58f665/go.mod h1:fi2IJfJuQqg39sbZP9E3p/4O1nPn4oMwbpJBPatddxQ= github.com/loft-sh/analytics-client v0.0.0-20231127192707-f76e263f6c83 h1:2vLLPFmp0obR4pMUID0chRYHZ0nlBpxupIkiBo1BZOU= github.com/loft-sh/analytics-client v0.0.0-20231127192707-f76e263f6c83/go.mod h1:FFWcGASyM2QlWTDTCG/WBVM/XYr8btqYt335TFNRCFg= -github.com/loft-sh/api/v3 v3.0.0-20240123094839-7e1855cd6ad7 h1:7YtS21EdAJCsAD1QJa5bvgM9LGtGY2FxkijaPga+lU0= -github.com/loft-sh/api/v3 v3.0.0-20240123094839-7e1855cd6ad7/go.mod h1:iXfQndb28bRnyvUHF51p/iYKZoPKYIF4yp6rq3rvoFo= -github.com/loft-sh/apiserver v0.0.0-20240122115656-e1a690b2e2d8 h1:3ABvaTlOBk+AdNqZCE6Vm5iItydFfhw4FcQA4AiyU/8= -github.com/loft-sh/apiserver v0.0.0-20240122115656-e1a690b2e2d8/go.mod h1:lX9CG5vj5kQ5mlSruMghnmpDjnWppWW1hxxOwJxukrU= +github.com/loft-sh/api/v3 v3.0.0-20240202135831-33c4357035e6 h1:pccJVE5R/ynLHO9IORX71qiiJsWxhJtZ8nECc3F5/1s= +github.com/loft-sh/api/v3 v3.0.0-20240202135831-33c4357035e6/go.mod h1:Wgin4umv68L4nc9YXjiSL2tFT9pjmYCNoMu+bwQQAv4= +github.com/loft-sh/apiserver v0.0.0-20240125143607-a106e2f2e0f1 h1:pdT9I+6jg5YV9vTlG4b0RRao3EvwjSNmH0Cihv7bPUg= +github.com/loft-sh/apiserver v0.0.0-20240125143607-a106e2f2e0f1/go.mod h1:lX9CG5vj5kQ5mlSruMghnmpDjnWppWW1hxxOwJxukrU= github.com/loft-sh/jspolicy v0.2.2 h1:+7QqVumYm225mSJsGOjnbCGYzh9XyKYQab6FgLiHYJU= github.com/loft-sh/jspolicy v0.2.2/go.mod h1:kbXD1CS17Ie9dqcq5iXrOhpSLESkmQpy4+F80YXOfUM= -github.com/loft-sh/loftctl/v3 v3.0.0-20240123132211-f09474d1f54c h1:v6swrF7aNwteqNbNmyxYF6zCgIb3vquBIwQKuqf4BnA= -github.com/loft-sh/loftctl/v3 v3.0.0-20240123132211-f09474d1f54c/go.mod h1:YIU5DIx1kyAumQvXBaMfHbWNbqo6yc1+R0aFga/Vcq0= +github.com/loft-sh/loftctl/v3 v3.0.0-20240202135933-6548c1e817a7 h1:TwTCxDmx04zi0pEZzmqMlhx8SYhq+2bTBa06nRCR01A= +github.com/loft-sh/loftctl/v3 v3.0.0-20240202135933-6548c1e817a7/go.mod h1:RG5+pgOZR23pA3KwjldO8LxLK/DlYbvUFymi50ZDrsQ= github.com/loft-sh/log v0.0.0-20230824104949-bd516c25712a h1:/gqqjKpcHEdFXIX41lx1Y/FBqT/72gbPpf7sa20tyM8= github.com/loft-sh/log v0.0.0-20230824104949-bd516c25712a/go.mod h1:YImeRjXH34Yf5E79T7UHBQpDZl9fIaaFRgyZ/bkY+UQ= github.com/loft-sh/utils v0.0.29 h1:P/MObccXToAZy2QoJSQDJ+OJx1qHitpFHEVj3QBSNJs= diff --git a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/names.go b/vendor/github.com/loft-sh/admin-apis/pkg/features/features.go similarity index 71% rename from vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/names.go rename to vendor/github.com/loft-sh/admin-apis/pkg/features/features.go index 219e0e6d1..48838098e 100644 --- a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/names.go +++ b/vendor/github.com/loft-sh/admin-apis/pkg/features/features.go @@ -1,4 +1,4 @@ -package licenseapi +package features type ProductName string type ModuleName string @@ -10,6 +10,7 @@ type ResourceStatus string type TrialStatus string type FeatureStatus string type FeatureName string +type ButtonName string // Products const ( @@ -75,6 +76,12 @@ const ( TrialStatusActive TrialStatus = "" ) +// Buttons +const ( + ButtonContactSales ButtonName = "contact-sales" + ButtonManageBilling ButtonName = "manage-billing" +) + // Feature Status const ( FeatureStatusActive FeatureStatus = "active" @@ -90,14 +97,17 @@ const ( DevPod FeatureName = "devpod" // Virtual Clusters - VirtualCluster FeatureName = "vclusters" - VirtualClusterSleepMode FeatureName = "vcluster-sleep-mode" - VirtualClusterCentralHostPathMapper FeatureName = "vcluster-host-path-mapper" - VirtualClusterProDistroImage FeatureName = "vcp-distro-image" - VirtualClusterProDistroAdmissionControl FeatureName = "vcp-distro-admission-control" - VirtualClusterProDistroBuiltInCoreDNS FeatureName = "vcp-distro-built-in-coredns" - VirtualClusterProDistroIsolatedControlPlane FeatureName = "vcp-distro-isolated-cp" - VirtualClusterProDistroSyncPatches FeatureName = "vcp-distro-sync-patches" + // when adding a new vCluster feature, add it to GetVClusterFeatures() as well + VirtualCluster FeatureName = "vclusters" + VirtualClusterSleepMode FeatureName = "vcluster-sleep-mode" + VirtualClusterCentralHostPathMapper FeatureName = "vcluster-host-path-mapper" + VirtualClusterProDistroImage FeatureName = "vcp-distro-image" + VirtualClusterProDistroAdmissionControl FeatureName = "vcp-distro-admission-control" + VirtualClusterProDistroBuiltInCoreDNS FeatureName = "vcp-distro-built-in-coredns" + VirtualClusterProDistroIsolatedControlPlane FeatureName = "vcp-distro-isolated-cp" + VirtualClusterProDistroSyncPatches FeatureName = "vcp-distro-sync-patches" + VirtualClusterProDistroCentralizedAdmissionControl FeatureName = "vcp-distro-centralized-admission-control" + VirtualClusterProEmbeddedEtcd FeatureName = "vcp-distro-embedded-etcd" // Spaces & Clusters ConnectedClusters FeatureName = "connected-clusters" @@ -141,3 +151,18 @@ const ( ConnectLocalCluster FeatureName = "connect-local-cluster" PasswordAuthentication FeatureName = "password-auth" ) + +func GetVClusterFeatures() []FeatureName { + return []FeatureName{ + VirtualCluster, + VirtualClusterSleepMode, + VirtualClusterCentralHostPathMapper, + VirtualClusterProDistroImage, + VirtualClusterProDistroAdmissionControl, + VirtualClusterProDistroBuiltInCoreDNS, + VirtualClusterProDistroIsolatedControlPlane, + VirtualClusterProDistroSyncPatches, + VirtualClusterProDistroCentralizedAdmissionControl, + VirtualClusterProEmbeddedEtcd, + } +} diff --git a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_button.go b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_button.go index ce49da55f..c9bdfaade 100644 --- a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_button.go +++ b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_button.go @@ -5,6 +5,10 @@ package licenseapi // +k8s:openapi-gen=true // +k8s:deepcopy-gen=true type Button struct { + // Name is the name of the button (ButtonName). Optional. + // +optional + Name string `json:"name,omitempty"` + // URL is the link at the other end of the button. ActionURL string `json:"url"` // DisplayText is the text to display on the button. If display text is unset the button will diff --git a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_module.go b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_module.go index f531031e3..43a91b7a4 100644 --- a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_module.go +++ b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_module.go @@ -1,5 +1,7 @@ package licenseapi +import "github.com/loft-sh/admin-apis/pkg/features" + // Module is a struct representing a module of the product // +k8s:openapi-gen=true // +k8s:deepcopy-gen=true @@ -11,7 +13,7 @@ type Module struct { DisplayName string `json:"displayName,omitempty"` // +optional - Status FeatureStatus `json:"status,omitempty"` + Status features.FeatureStatus `json:"status,omitempty"` Limits []*Limit `json:"limits,omitempty"` Features []*Feature `json:"features,omitempty"` diff --git a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_new.go b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_new.go index aa0161caf..904bd85d9 100644 --- a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_new.go +++ b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_new.go @@ -1,279 +1,288 @@ package licenseapi -var Limits = map[ResourceName]*Limit{ - ConnectedClusterLimit: { +import "github.com/loft-sh/admin-apis/pkg/features" + +// TODO: move this out of this package + +var Limits = map[features.ResourceName]*Limit{ + features.ConnectedClusterLimit: { DisplayName: "Connected Clusters", - Name: string(ConnectedClusterLimit), + Name: string(features.ConnectedClusterLimit), }, - VirtualClusterInstanceLimit: { + features.VirtualClusterInstanceLimit: { DisplayName: "Virtual Clusters", - Name: string(VirtualClusterInstanceLimit), + Name: string(features.VirtualClusterInstanceLimit), }, - DevPodWorkspaceInstanceLimit: { + features.DevPodWorkspaceInstanceLimit: { DisplayName: "Dev Environments", - Name: string(DevPodWorkspaceInstanceLimit), + Name: string(features.DevPodWorkspaceInstanceLimit), }, - UserLimit: { + features.UserLimit: { DisplayName: "Users", - Name: string(UserLimit), + Name: string(features.UserLimit), }, - InstanceLimit: { + features.InstanceLimit: { DisplayName: "Instances", - Name: string(InstanceLimit), + Name: string(features.InstanceLimit), }, } -func New(product ProductName) *License { - allowedStatus := string(FeatureStatusActive) +func New(product features.ProductName) *License { + allowedStatus := string(features.FeatureStatusActive) - connectedClusterStatus := string(FeatureStatusActive) - if product != VClusterPro && product != Loft { - connectedClusterStatus = string(FeatureStatusDisallowed) + connectedClusterStatus := string(features.FeatureStatusActive) + if product != features.VClusterPro && product != features.Loft { + connectedClusterStatus = string(features.FeatureStatusDisallowed) } - namespaceStatus := string(FeatureStatusActive) - if product != Loft { - namespaceStatus = string(FeatureStatusDisallowed) + namespaceStatus := string(features.FeatureStatusActive) + if product != features.Loft { + namespaceStatus = string(features.FeatureStatusDisallowed) } - virtualClusterStatus := string(FeatureStatusActive) - if product != VClusterPro && product != Loft { - virtualClusterStatus = string(FeatureStatusDisallowed) + virtualClusterStatus := string(features.FeatureStatusActive) + if product != features.VClusterPro && product != features.Loft { + virtualClusterStatus = string(features.FeatureStatusDisallowed) } - devpodStatus := string(FeatureStatusActive) - if product != DevPodPro { - devpodStatus = string(FeatureStatusDisallowed) + devpodStatus := string(features.FeatureStatusActive) + if product != features.DevPodPro { + devpodStatus = string(features.FeatureStatusDisallowed) } return &License{ Modules: []*Module{ { DisplayName: "Virtual Clusters", - Name: string(VirtualClusterModule), + Name: string(features.VirtualClusterModule), Limits: []*Limit{ - Limits[VirtualClusterInstanceLimit], + Limits[features.VirtualClusterInstanceLimit], }, Features: []*Feature{ { DisplayName: "Virtual Cluster Management", - Name: string(VirtualCluster), + Name: string(features.VirtualCluster), Status: virtualClusterStatus, }, { DisplayName: "Sleep Mode for Virtual Clusters", - Name: string(VirtualClusterSleepMode), + Name: string(features.VirtualClusterSleepMode), Status: virtualClusterStatus, }, { DisplayName: "Central HostPath Mapper", - Name: string(VirtualClusterCentralHostPathMapper), + Name: string(features.VirtualClusterCentralHostPathMapper), Status: virtualClusterStatus, }, }, }, { DisplayName: "vCluster.Pro Distro", - Name: string(VClusterProDistroModule), + Name: string(features.VClusterProDistroModule), Features: []*Feature{ { DisplayName: "Security-Hardened vCluster Image", - Name: string(VirtualClusterProDistroImage), + Name: string(features.VirtualClusterProDistroImage), Status: virtualClusterStatus, }, { DisplayName: "Built-In CoreDNS", - Name: string(VirtualClusterProDistroBuiltInCoreDNS), + Name: string(features.VirtualClusterProDistroBuiltInCoreDNS), Status: virtualClusterStatus, }, { DisplayName: "Virtual Admission Control", - Name: string(VirtualClusterProDistroAdmissionControl), - Status: string(FeatureStatusHidden), + Name: string(features.VirtualClusterProDistroAdmissionControl), + Status: string(features.FeatureStatusHidden), }, { DisplayName: "Sync Patches", - Name: string(VirtualClusterProDistroSyncPatches), + Name: string(features.VirtualClusterProDistroSyncPatches), Status: virtualClusterStatus, }, { DisplayName: "Isolated Control Plane", - Name: string(VirtualClusterProDistroIsolatedControlPlane), + Name: string(features.VirtualClusterProDistroIsolatedControlPlane), + Status: virtualClusterStatus, + }, + { + DisplayName: "Centralized Admission Control", + Name: string(features.VirtualClusterProDistroCentralizedAdmissionControl), Status: virtualClusterStatus, }, }, }, { DisplayName: "Dev Environments", - Name: string(DevPodModule), + Name: string(features.DevPodModule), Limits: []*Limit{ - Limits[DevPodWorkspaceInstanceLimit], + Limits[features.DevPodWorkspaceInstanceLimit], }, Features: []*Feature{ { DisplayName: "Dev Environment Management", - Name: string(DevPod), + Name: string(features.DevPod), Status: devpodStatus, }, }, }, { DisplayName: "Kubernetes Namespaces", - Name: string(KubernetesNamespaceModule), + Name: string(features.KubernetesNamespaceModule), Features: []*Feature{ { DisplayName: "Namespace Management", - Name: string(Namespace), + Name: string(features.Namespace), Status: namespaceStatus, }, { DisplayName: "Sleep Mode for Namespaces", - Name: string(NamespaceSleepMode), + Name: string(features.NamespaceSleepMode), Status: namespaceStatus, }, }, }, { DisplayName: "Kubernetes Clusters", - Name: string(KubernetesClusterModule), + Name: string(features.KubernetesClusterModule), Limits: []*Limit{ - Limits[ConnectedClusterLimit], + Limits[features.ConnectedClusterLimit], }, Features: []*Feature{ { DisplayName: "Connected Clusters", - Name: string(ConnectedClusters), + Name: string(features.ConnectedClusters), Status: connectedClusterStatus, }, { DisplayName: "Cluster Access", - Name: string(ClusterAccess), + Name: string(features.ClusterAccess), Status: connectedClusterStatus, }, { DisplayName: "Cluster Role Management", - Name: string(ClusterRoles), + Name: string(features.ClusterRoles), Status: connectedClusterStatus, }, }, }, { DisplayName: "Authentication & Audit Logging", - Name: string(AuthModule), + Name: string(features.AuthModule), Limits: []*Limit{ - Limits[UserLimit], + Limits[features.UserLimit], }, Features: []*Feature{ { DisplayName: "Single Sign-On", - Name: string(SSOAuth), + Name: string(features.SSOAuth), Status: allowedStatus, }, { DisplayName: "Audit Logging", - Name: string(AuditLogging), + Name: string(features.AuditLogging), Status: allowedStatus, }, { DisplayName: "Automatic Auth For Ingresses", - Name: string(AutomaticIngressAuth), + Name: string(features.AutomaticIngressAuth), Status: allowedStatus, }, { DisplayName: "Loft as OIDC Provider", - Name: string(OIDCProvider), + Name: string(features.OIDCProvider), Status: allowedStatus, }, { DisplayName: "Multiple SSO Providers", - Name: string(MultipleSSOProviders), + Name: string(features.MultipleSSOProviders), Status: allowedStatus, }, }, }, { DisplayName: "Templating & GitOps", - Name: string(TemplatingModule), + Name: string(features.TemplatingModule), Features: []*Feature{ { DisplayName: "Apps", - Name: string(Apps), + Name: string(features.Apps), Status: allowedStatus, }, { DisplayName: "Template Versioning", - Name: string(TemplateVersioning), + Name: string(features.TemplateVersioning), Status: allowedStatus, }, { DisplayName: "Argo Integration", - Name: string(ArgoIntegration), + Name: string(features.ArgoIntegration), Status: allowedStatus, }, { DisplayName: "Rancher Integration", - Name: string(RancherIntegration), + Name: string(features.RancherIntegration), Status: allowedStatus, }, }, }, { DisplayName: "Secrets Management", - Name: string(SecretsModule), + Name: string(features.SecretsModule), Features: []*Feature{ { DisplayName: "Secrets Sync", - Name: string(Secrets), + Name: string(features.Secrets), Status: allowedStatus, }, { DisplayName: "Secrets Encryption", - Name: string(SecretEncryption), + Name: string(features.SecretEncryption), Status: allowedStatus, }, { DisplayName: "HashiCorp Vault Integration", - Name: string(VaultIntegration), + Name: string(features.VaultIntegration), Status: allowedStatus, }, }, }, { DisplayName: "Deployment Modes", - Name: string(DeploymentModesModule), + Name: string(features.DeploymentModesModule), Limits: []*Limit{ - Limits[InstanceLimit], + Limits[features.InstanceLimit], }, Features: []*Feature{ { DisplayName: "High-Availability Mode", - Name: string(HighAvailabilityMode), + Name: string(features.HighAvailabilityMode), Status: allowedStatus, }, { DisplayName: "Multi-Region Mode", - Name: string(MultiRegionMode), + Name: string(features.MultiRegionMode), Status: allowedStatus, }, { DisplayName: "Air-Gapped Mode", - Name: string(AirGappedMode), + Name: string(features.AirGappedMode), Status: allowedStatus, }, }, }, { DisplayName: "UI Customization", - Name: string(UIModule), + Name: string(features.UIModule), Features: []*Feature{ { DisplayName: "Custom Branding", - Name: string(CustomBranding), + Name: string(features.CustomBranding), Status: allowedStatus, }, { DisplayName: "Advanced UI Customizations", - Name: string(AdvancedUICustomizations), + Name: string(features.AdvancedUICustomizations), Status: allowedStatus, }, }, diff --git a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_plan.go b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_plan.go index a13359dd6..1a52c0989 100644 --- a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_plan.go +++ b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/license_plan.go @@ -1,5 +1,7 @@ package licenseapi +import "github.com/loft-sh/admin-apis/pkg/features" + // Plan definition // +k8s:openapi-gen=true // +k8s:deepcopy-gen=true @@ -15,7 +17,7 @@ type Plan struct { // There should only be 1 active plan at the top-level (not including AddOns) // The respective price in Prices will have the active status as well // +optional - Status PlanStatus `json:"status,omitempty"` + Status features.PlanStatus `json:"status,omitempty"` // Period provides information about the plan's current period // This is nil unless this is the active plan @@ -84,11 +86,11 @@ type PlanPrice struct { // Status is the status of the price (PlanStatus) // If the plan is active, one of its prices must be active as well // +optional - Status PlanStatus `json:"status,omitempty"` + Status features.PlanStatus `json:"status,omitempty"` // Interval contains the time span of each period (e.g. month, year) // +optional - Interval PlanInterval `json:"interval,omitempty"` + Interval features.PlanInterval `json:"interval,omitempty"` // IntervalCount specifies if the number of intervals (e.g. 3 [months]) // +optional @@ -110,7 +112,7 @@ type PlanPrice struct { // TierMode defines how tiers should be used // +optional - TierMode TierMode `json:"tierMode,omitempty"` + TierMode features.TierMode `json:"tierMode,omitempty"` // Tiers is a list of tiers in this plan // +optional @@ -126,7 +128,7 @@ type TierResource struct { // Status defines which resources will be counted towards the limit (e.g. active, total, total created etc.) // +optional - Status ResourceStatus `json:"status,omitempty"` + Status features.ResourceStatus `json:"status,omitempty"` } // PriceTier defines a tier within a plan diff --git a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/request_instance.go b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/request_instance.go index a5d491fbf..3d9b05f6a 100644 --- a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/request_instance.go +++ b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/request_instance.go @@ -29,6 +29,11 @@ type InstanceCreateInput struct { // FeatureUse contains information about what features are used FeatureUsage map[string]bool `json:"features,omitempty" form:"features"` + + // ForcedInstanceID is the ID of the instance. This is only used for testing purposes. + // Should never be sent from production instances. + // Requires authentication via an access key. + ForcedInstanceID string `json:"forcedInstanceID,omitempty" form:"forcedInstanceID"` } // InstanceCreateOutput is the struct holding all information returned from "instance create" diff --git a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/zz_generated.deepcopy.go b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/zz_generated.deepcopy.go index b3109b3a4..42ecfa451 100644 --- a/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/zz_generated.deepcopy.go +++ b/vendor/github.com/loft-sh/admin-apis/pkg/licenseapi/zz_generated.deepcopy.go @@ -404,6 +404,9 @@ func (in *LicenseAPIRoutes) DeepCopyInto(out *LicenseAPIRoutes) { out.ChatAuth = in.ChatAuth out.FeatureDetails = in.FeatureDetails out.FeatureSetup = in.FeatureSetup + out.FeaturePreview = in.FeaturePreview + out.ModuleActivation = in.ModuleActivation + out.ModulePreview = in.ModulePreview out.Checkout = in.Checkout out.Portal = in.Portal return diff --git a/vendor/github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/zz_generated.api.register.go b/vendor/github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/zz_generated.api.register.go index ae70dac17..a7a3d38f0 100644 --- a/vendor/github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/zz_generated.api.register.go +++ b/vendor/github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/zz_generated.api.register.go @@ -246,15 +246,15 @@ type NamespacePhase string type Status string type AppliedObject struct { - APIVersion string - Kind string - Name string + APIVersion string `json:"apiVersion,omitempty"` + Kind string `json:"kind,omitempty"` + Name string `json:"name,omitempty"` } type Bash struct { - Script string - Image string - ClusterRole string + Script string `json:"script,omitempty"` + Image string `json:"image,omitempty"` + ClusterRole string `json:"clusterRole,omitempty"` } // +genclient @@ -262,20 +262,20 @@ type Bash struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ChartInfo struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ChartInfoSpec - Status ChartInfoStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ChartInfoSpec `json:"spec,omitempty"` + Status ChartInfoStatus `json:"status,omitempty"` } type ChartInfoSpec struct { - Chart storagev1.Chart + Chart storagev1.Chart `json:"chart,omitempty"` } type ChartInfoStatus struct { - Metadata *Metadata - Readme string - Values string + Metadata *Metadata `json:"metadata,omitempty"` + Readme string `json:"readme,omitempty"` + Values string `json:"values,omitempty"` } // +genclient @@ -283,33 +283,33 @@ type ChartInfoStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterQuota struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ClusterQuotaSpec - Status ClusterQuotaStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ClusterQuotaSpec `json:"spec,omitempty"` + Status ClusterQuotaStatus `json:"status,omitempty"` } type ClusterQuotaSpec struct { - storagev1.ClusterQuotaSpec + storagev1.ClusterQuotaSpec `json:",inline"` } type ClusterQuotaStatus struct { - storagev1.ClusterQuotaStatus - Owner *UserOrTeam + storagev1.ClusterQuotaStatus `json:",inline"` + Owner *UserOrTeam `json:"owner,omitempty"` } type EntityInfo struct { - Name string - DisplayName string - Icon string - Username string - Email string - Subject string + Name string `json:"name,omitempty"` + DisplayName string `json:"displayName,omitempty"` + Icon string `json:"icon,omitempty"` + Username string `json:"username,omitempty"` + Email string `json:"email,omitempty"` + Subject string `json:"subject,omitempty"` } type EpochInfo struct { - Start int64 - Slept int64 + Start int64 `json:"start,omitempty"` + Slept int64 `json:"slept,omitempty"` } // +genclient @@ -317,19 +317,19 @@ type EpochInfo struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Feature struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec FeatureSpec - Status FeatureStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec FeatureSpec `json:"spec,omitempty"` + Status FeatureStatus `json:"status,omitempty"` } type FeatureSpec struct { } type FeatureStatus struct { - pkglicenseapi.Feature - Internal bool - Used bool + pkglicenseapi.Feature `json:",inline"` + Internal bool `json:"internal,omitempty"` + Used bool `json:"used,omitempty"` } // +genclient @@ -337,49 +337,49 @@ type FeatureStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type HelmRelease struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec HelmReleaseSpec - Status HelmReleaseStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec HelmReleaseSpec `json:"spec,omitempty"` + Status HelmReleaseStatus `json:"status,omitempty"` } type HelmReleaseConfig struct { - Chart storagev1.Chart - Manifests string - Bash *Bash - Values string - Parameters string - Annotations map[string]string + Chart storagev1.Chart `json:"chart,omitempty"` + Manifests string `json:"manifests,omitempty"` + Bash *Bash `json:"bash,omitempty"` + Values string `json:"values,omitempty"` + Parameters string `json:"parameters,omitempty"` + Annotations map[string]string `json:"annotations,omitempty"` } type HelmReleaseSpec struct { - HelmReleaseConfig + HelmReleaseConfig `json:",inline"` } type HelmReleaseStatus struct { - Revision int - Info *Info - Metadata *Metadata + Revision int `json:"version,omitempty"` + Info *Info `json:"info,omitempty"` + Metadata *Metadata `json:"metadata,omitempty"` } type Info struct { - FirstDeployed metav1.Time - LastDeployed metav1.Time - Deleted metav1.Time - Description string - Status Status - Notes string + FirstDeployed metav1.Time `json:"first_deployed,omitempty"` + LastDeployed metav1.Time `json:"last_deployed,omitempty"` + Deleted metav1.Time `json:"deleted"` + Description string `json:"description,omitempty"` + Status Status `json:"status,omitempty"` + Notes string `json:"notes,omitempty"` } type LastActivityInfo struct { - Subject string - Host string - Verb string - APIGroup string - Resource string - Subresource string - Name string - VirtualCluster string + Subject string `json:"subject,omitempty"` + Host string `json:"host,omitempty"` + Verb string `json:"verb,omitempty"` + APIGroup string `json:"apiGroup,omitempty"` + Resource string `json:"resource,omitempty"` + Subresource string `json:"subresource,omitempty"` + Name string `json:"name,omitempty"` + VirtualCluster string `json:"virtualCluster,omitempty"` } // +genclient @@ -387,46 +387,46 @@ type LastActivityInfo struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LocalClusterAccess struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec LocalClusterAccessSpec - Status LocalClusterAccessStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec LocalClusterAccessSpec `json:"spec,omitempty"` + Status LocalClusterAccessStatus `json:"status,omitempty"` } type LocalClusterAccessSpec struct { - storagev1.LocalClusterAccessSpec + storagev1.LocalClusterAccessSpec `json:",inline"` } type LocalClusterAccessStatus struct { - storagev1.LocalClusterAccessStatus - Users []*UserOrTeam - Teams []*EntityInfo + storagev1.LocalClusterAccessStatus `json:",inline"` + Users []*UserOrTeam `json:"users,omitempty"` + Teams []*EntityInfo `json:"teams,omitempty"` } type Maintainer struct { - Name string - Email string - URL string + Name string `json:"name,omitempty"` + Email string `json:"email,omitempty"` + URL string `json:"url,omitempty"` } type Metadata struct { - Name string - Home string - Sources []string - Version string - Description string - Keywords []string - Maintainers []*Maintainer - Icon string - APIVersion string - Condition string - Tags string - AppVersion string - Deprecated bool - Annotations map[string]string - KubeVersion string - Type string - Urls []string + Name string `json:"name,omitempty"` + Home string `json:"home,omitempty"` + Sources []string `json:"sources,omitempty"` + Version string `json:"version,omitempty"` + Description string `json:"description,omitempty"` + Keywords []string `json:"keywords,omitempty"` + Maintainers []*Maintainer `json:"maintainers,omitempty"` + Icon string `json:"icon,omitempty"` + APIVersion string `json:"apiVersion,omitempty"` + Condition string `json:"condition,omitempty"` + Tags string `json:"tags,omitempty"` + AppVersion string `json:"appVersion,omitempty"` + Deprecated bool `json:"deprecated,omitempty"` + Annotations map[string]string `json:"annotations,omitempty"` + KubeVersion string `json:"kubeVersion,omitempty"` + Type string `json:"type,omitempty"` + Urls []string `json:"urls,omitempty"` } // +genclient @@ -434,43 +434,43 @@ type Metadata struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SleepModeConfig struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SleepModeConfigSpec - Status SleepModeConfigStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SleepModeConfigSpec `json:"spec,omitempty"` + Status SleepModeConfigStatus `json:"status,omitempty"` } type SleepModeConfigSpec struct { - ForceSleep bool - ForceSleepDuration *int64 - DeleteAfter int64 - SleepAfter int64 - SleepSchedule string - WakeupSchedule string - Timezone string - IgnoreActiveConnections bool - IgnoreAll bool - IgnoreIngresses bool - IgnoreVClusters bool - IgnoreGroups string - IgnoreVerbs string - IgnoreResources string - IgnoreResourceVerbs string - IgnoreResourceNames string - IgnoreUseragents string + ForceSleep bool `json:"forceSleep,omitempty"` + ForceSleepDuration *int64 `json:"forceSleepDuration,omitempty"` + DeleteAfter int64 `json:"deleteAfter,omitempty"` + SleepAfter int64 `json:"sleepAfter,omitempty"` + SleepSchedule string `json:"sleepSchedule,omitempty"` + WakeupSchedule string `json:"wakeupSchedule,omitempty"` + Timezone string `json:"timezone,omitempty"` + IgnoreActiveConnections bool `json:"ignoreActiveConnections,omitempty"` + IgnoreAll bool `json:"ignoreAll,omitempty"` + IgnoreIngresses bool `json:"ignoreIngresses,omitempty"` + IgnoreVClusters bool `json:"ignoreVClusters,omitempty"` + IgnoreGroups string `json:"ignoreGroups,omitempty"` + IgnoreVerbs string `json:"ignoreVerbs,omitempty"` + IgnoreResources string `json:"ignoreResources,omitempty"` + IgnoreResourceVerbs string `json:"ignoreResourceVerbs,omitempty"` + IgnoreResourceNames string `json:"ignoreResourceNames,omitempty"` + IgnoreUseragents string `json:"ignoreUserAgents,omitempty"` } type SleepModeConfigStatus struct { - LastActivity int64 - LastActivityInfo *LastActivityInfo - SleepingSince int64 - CurrentEpoch *EpochInfo - LastEpoch *EpochInfo - SleptLastThirtyDays *float64 - SleptLastSevenDays *float64 - ScheduledSleep *int64 - ScheduledWakeup *int64 - SleepType string + LastActivity int64 `json:"lastActivity,omitempty"` + LastActivityInfo *LastActivityInfo `json:"lastActivityInfo,omitempty"` + SleepingSince int64 `json:"sleepingSince,omitempty"` + CurrentEpoch *EpochInfo `json:"currentEpoch,omitempty"` + LastEpoch *EpochInfo `json:"lastEpoch,omitempty"` + SleptLastThirtyDays *float64 `json:"sleptLastThirtyDays,omitempty"` + SleptLastSevenDays *float64 `json:"sleptLastSevenDays,omitempty"` + ScheduledSleep *int64 `json:"scheduledSleep,omitempty"` + ScheduledWakeup *int64 `json:"scheduledWakeup,omitempty"` + SleepType string `json:"sleepType,omitempty"` } // +genclient @@ -478,42 +478,42 @@ type SleepModeConfigStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Space struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SpaceSpec - Status SpaceStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SpaceSpec `json:"spec,omitempty"` + Status SpaceStatus `json:"status,omitempty"` } type SpaceObjectsNamespaceStatus struct { - Phase string - Reason string - Message string - AppliedObjects []AppliedObject + Phase string `json:"phase,omitempty"` + Reason string `json:"reason,omitempty"` + Message string `json:"message,omitempty"` + AppliedObjects []AppliedObject `json:"appliedObjects,omitempty"` } type SpaceSpec struct { - User string - Team string - Objects string - Finalizers []corev1.FinalizerName + User string `json:"user,omitempty"` + Team string `json:"team,omitempty"` + Objects string `json:"objects,omitempty"` + Finalizers []corev1.FinalizerName `json:"finalizers,omitempty"` } type SpaceStatus struct { - Phase corev1.NamespacePhase - SleepModeConfig *SleepModeConfig - Owner *UserOrTeam - SpaceObjectsStatus *SpaceObjectsNamespaceStatus - TemplateSyncStatus *TemplateSyncStatus + Phase corev1.NamespacePhase `json:"phase,omitempty"` + SleepModeConfig *SleepModeConfig `json:"sleepModeConfig,omitempty"` + Owner *UserOrTeam `json:"owner,omitempty"` + SpaceObjectsStatus *SpaceObjectsNamespaceStatus `json:"spaceObjectsStatus,omitempty"` + TemplateSyncStatus *TemplateSyncStatus `json:"templateSyncStatus,omitempty"` } type TemplateSyncStatus struct { - Template string - Phase string + Template string `json:"template,omitempty"` + Phase string `json:"phase,omitempty"` } type UserOrTeam struct { - User *EntityInfo - Team *EntityInfo + User *EntityInfo `json:"user,omitempty"` + Team *EntityInfo `json:"team,omitempty"` } // +genclient @@ -521,22 +521,22 @@ type UserOrTeam struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualCluster struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec VirtualClusterSpec - Status VirtualClusterStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec VirtualClusterSpec `json:"spec,omitempty"` + Status VirtualClusterStatus `json:"status,omitempty"` } type VirtualClusterSpec struct { - storagev1.VirtualClusterSpec + storagev1.VirtualClusterSpec `json:",inline"` } type VirtualClusterStatus struct { - storagev1.VirtualClusterStatus - SyncerPod *corev1.Pod - ClusterPod *corev1.Pod - SleepModeConfig *SleepModeConfig - TemplateSyncStatus *TemplateSyncStatus + storagev1.VirtualClusterStatus `json:",inline"` + SyncerPod *corev1.Pod `json:"syncerPod,omitempty"` + ClusterPod *corev1.Pod `json:"clusterPod,omitempty"` + SleepModeConfig *SleepModeConfig `json:"sleepModeConfig,omitempty"` + TemplateSyncStatus *TemplateSyncStatus `json:"templateSyncStatus,omitempty"` } // ChartInfo Functions and Structs @@ -554,9 +554,9 @@ type ChartInfoStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ChartInfoList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ChartInfo + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ChartInfo `json:"items"` } func (ChartInfo) NewStatus() interface{} { @@ -673,9 +673,9 @@ type ClusterQuotaStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterQuotaList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterQuota + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterQuota `json:"items"` } func (ClusterQuota) NewStatus() interface{} { @@ -792,9 +792,9 @@ type FeatureStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type FeatureList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Feature + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Feature `json:"items"` } func (Feature) NewStatus() interface{} { @@ -911,9 +911,9 @@ type HelmReleaseStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type HelmReleaseList struct { - metav1.TypeMeta - metav1.ListMeta - Items []HelmRelease + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []HelmRelease `json:"items"` } func (HelmRelease) NewStatus() interface{} { @@ -1030,9 +1030,9 @@ type LocalClusterAccessStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LocalClusterAccessList struct { - metav1.TypeMeta - metav1.ListMeta - Items []LocalClusterAccess + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []LocalClusterAccess `json:"items"` } func (LocalClusterAccess) NewStatus() interface{} { @@ -1149,9 +1149,9 @@ type SleepModeConfigStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SleepModeConfigList struct { - metav1.TypeMeta - metav1.ListMeta - Items []SleepModeConfig + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []SleepModeConfig `json:"items"` } func (SleepModeConfig) NewStatus() interface{} { @@ -1268,9 +1268,9 @@ type SpaceStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SpaceList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Space + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Space `json:"items"` } func (Space) NewStatus() interface{} { @@ -1387,9 +1387,9 @@ type VirtualClusterStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterList struct { - metav1.TypeMeta - metav1.ListMeta - Items []VirtualCluster + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []VirtualCluster `json:"items"` } func (VirtualCluster) NewStatus() interface{} { diff --git a/vendor/github.com/loft-sh/api/v3/pkg/apis/management/install/zz_generated.api.register.go b/vendor/github.com/loft-sh/api/v3/pkg/apis/management/install/zz_generated.api.register.go index 709718d13..b84bbe193 100644 --- a/vendor/github.com/loft-sh/api/v3/pkg/apis/management/install/zz_generated.api.register.go +++ b/vendor/github.com/loft-sh/api/v3/pkg/apis/management/install/zz_generated.api.register.go @@ -4,7 +4,7 @@ package install import ( "github.com/loft-sh/api/v3/pkg/apis/management" - v1 "github.com/loft-sh/api/v3/pkg/apis/management/v1" + "github.com/loft-sh/api/v3/pkg/apis/management/v1" "github.com/loft-sh/apiserver/pkg/builders" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" diff --git a/vendor/github.com/loft-sh/api/v3/pkg/apis/management/zz_generated.api.register.go b/vendor/github.com/loft-sh/api/v3/pkg/apis/management/zz_generated.api.register.go index 559e22f18..c9529cb1f 100644 --- a/vendor/github.com/loft-sh/api/v3/pkg/apis/management/zz_generated.api.register.go +++ b/vendor/github.com/loft-sh/api/v3/pkg/apis/management/zz_generated.api.register.go @@ -1326,19 +1326,19 @@ type RequestTarget string type Stage string type AgentAnalyticsSpec struct { - AnalyticsEndpoint string + AnalyticsEndpoint string `json:"analyticsEndpoint,omitempty"` } type AgentAuditConfig struct { - Enabled bool - DisableAgentSyncBack bool - Level int - Policy AuditPolicy - Path string - MaxAge int - MaxBackups int - MaxSize int - Compress bool + Enabled bool `json:"enabled,omitempty"` + DisableAgentSyncBack bool `json:"disableAgentSyncBack,omitempty"` + Level int `json:"level,omitempty"` + Policy AuditPolicy `json:"policy,omitempty"` + Path string `json:"path,omitempty"` + MaxAge int `json:"maxAge,omitempty"` + MaxBackups int `json:"maxBackups,omitempty"` + MaxSize int `json:"maxSize,omitempty"` + Compress bool `json:"compress,omitempty"` } // +genclient @@ -1346,14 +1346,14 @@ type AgentAuditConfig struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type AgentAuditEvent struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec AgentAuditEventSpec - Status AgentAuditEventStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec AgentAuditEventSpec `json:"spec,omitempty"` + Status AgentAuditEventStatus `json:"status,omitempty"` } type AgentAuditEventSpec struct { - Events []*auditv1.Event + Events []*auditv1.Event `json:"events,omitempty"` } type AgentAuditEventStatus struct { @@ -1364,17 +1364,17 @@ type AgentAuditEventStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Announcement struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec AnnouncementSpec - Status AnnouncementStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec AnnouncementSpec `json:"spec,omitempty"` + Status AnnouncementStatus `json:"status,omitempty"` } type AnnouncementSpec struct { } type AnnouncementStatus struct { - Announcement pkglicenseapi.Announcement + Announcement pkglicenseapi.Announcement `json:"announcement,omitempty"` } // +genclient @@ -1382,181 +1382,181 @@ type AnnouncementStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type App struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec AppSpec - Status AppStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec AppSpec `json:"spec,omitempty"` + Status AppStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type AppCredentials struct { - metav1.TypeMeta - metav1.ObjectMeta - ProjectSecretRefs map[string]string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + ProjectSecretRefs map[string]string `json:"projectSecretRefs,omitempty"` } type AppSpec struct { - storagev1.AppSpec + storagev1.AppSpec `json:",inline"` } type AppStatus struct { - storagev1.AppStatus + storagev1.AppStatus `json:",inline"` } type Apps struct { - NoDefault bool - Repositories []storagev1.HelmChartRepository - PredefinedApps []PredefinedApp + NoDefault bool `json:"noDefault,omitempty"` + Repositories []storagev1.HelmChartRepository `json:"repositories,omitempty"` + PredefinedApps []PredefinedApp `json:"predefinedApps,omitempty"` } type Audit struct { - Enabled bool - DisableAgentSyncBack bool - Level int - Policy AuditPolicy - DataStoreEndpoint string - DataStoreMaxAge *int - Path string - MaxAge int - MaxBackups int - MaxSize int - Compress bool + Enabled bool `json:"enabled,omitempty"` + DisableAgentSyncBack bool `json:"disableAgentSyncBack,omitempty"` + Level int `json:"level,omitempty"` + Policy AuditPolicy `json:"policy,omitempty"` + DataStoreEndpoint string `json:"dataStoreEndpoint,omitempty"` + DataStoreMaxAge *int `json:"dataStoreTTL,omitempty"` + Path string `json:"path,omitempty"` + MaxAge int `json:"maxAge,omitempty"` + MaxBackups int `json:"maxBackups,omitempty"` + MaxSize int `json:"maxSize,omitempty"` + Compress bool `json:"compress,omitempty"` } type AuditPolicy struct { - Rules []AuditPolicyRule - OmitStages []auditv1.Stage + Rules []AuditPolicyRule `json:"rules,omitempty"` + OmitStages []auditv1.Stage `json:"omitStages,omitempty"` } type AuditPolicyRule struct { - Level auditv1.Level - Users []string - UserGroups []string - Verbs []string - Resources []GroupResources - Namespaces []string - NonResourceURLs []string - OmitStages []auditv1.Stage - RequestTargets []auditv1.RequestTarget - Clusters []string + Level auditv1.Level `json:"level"` + Users []string `json:"users,omitempty"` + UserGroups []string `json:"userGroups,omitempty"` + Verbs []string `json:"verbs,omitempty"` + Resources []GroupResources `json:"resources,omitempty"` + Namespaces []string `json:"namespaces,omitempty"` + NonResourceURLs []string `json:"nonResourceURLs,omitempty"` + OmitStages []auditv1.Stage `json:"omitStages,omitempty" protobuf:"bytes,8,rep,name=omitStages"` + RequestTargets []auditv1.RequestTarget `json:"requestTargets,omitempty"` + Clusters []string `json:"clusters,omitempty"` } type Authentication struct { - Connector - Rancher *AuthenticationRancher - Password *AuthenticationPassword - Connectors []ConnectorWithName - DisableTeamCreation bool - AccessKeyMaxTTLSeconds int64 - LoginAccessKeyTTLSeconds *int64 - CustomHttpHeaders map[string]string + Connector `json:",inline"` + Rancher *AuthenticationRancher `json:"rancher,omitempty"` + Password *AuthenticationPassword `json:"password,omitempty"` + Connectors []ConnectorWithName `json:"connectors,omitempty"` + DisableTeamCreation bool `json:"disableTeamCreation,omitempty"` + AccessKeyMaxTTLSeconds int64 `json:"accessKeyMaxTTLSeconds,omitempty"` + LoginAccessKeyTTLSeconds *int64 `json:"loginAccessKeyTTLSeconds,omitempty"` + CustomHttpHeaders map[string]string `json:"customHttpHeaders,omitempty"` } type AuthenticationClusterAccountTemplates struct { - ClusterAccountTemplates []storagev1.UserClusterAccountTemplate - GroupClusterAccountTemplates []AuthenticationGroupClusterAccountTemplate + ClusterAccountTemplates []storagev1.UserClusterAccountTemplate `json:"clusterAccountTemplates,omitempty"` + GroupClusterAccountTemplates []AuthenticationGroupClusterAccountTemplate `json:"groupClusterAccountTemplates,omitempty"` } type AuthenticationGithub struct { - ClientID string - ClientSecret string - RedirectURI string - Orgs []AuthenticationGithubOrg - HostName string - RootCA string - AuthenticationClusterAccountTemplates + ClientID string `json:"clientId,omitempty"` + ClientSecret string `json:"clientSecret"` + RedirectURI string `json:"redirectURI"` + Orgs []AuthenticationGithubOrg `json:"orgs,omitempty"` + HostName string `json:"hostName,omitempty"` + RootCA string `json:"rootCA,omitempty"` + AuthenticationClusterAccountTemplates `json:",inline"` } type AuthenticationGithubOrg struct { - Name string - Teams []string + Name string `json:"name"` + Teams []string `json:"teams,omitempty"` } type AuthenticationGitlab struct { - ClientID string - ClientSecret string - RedirectURI string - BaseURL string - Groups []string - AuthenticationClusterAccountTemplates + ClientID string `json:"clientId"` + ClientSecret string `json:"clientSecret"` + RedirectURI string `json:"redirectURI"` + BaseURL string `json:"baseURL,omitempty"` + Groups []string `json:"groups,omitempty"` + AuthenticationClusterAccountTemplates `json:",inline"` } type AuthenticationGoogle struct { - ClientID string - ClientSecret string - RedirectURI string - Scopes []string - HostedDomains []string - Groups []string - ServiceAccountFilePath string - AdminEmail string - AuthenticationClusterAccountTemplates + ClientID string `json:"clientId"` + ClientSecret string `json:"clientSecret"` + RedirectURI string `json:"redirectURI"` + Scopes []string `json:"scopes,omitempty"` + HostedDomains []string `json:"hostedDomains,omitempty"` + Groups []string `json:"groups,omitempty"` + ServiceAccountFilePath string `json:"serviceAccountFilePath,omitempty"` + AdminEmail string `json:"adminEmail,omitempty"` + AuthenticationClusterAccountTemplates `json:",inline"` } type AuthenticationGroupClusterAccountTemplate struct { - Group string - ClusterAccountTemplates []storagev1.UserClusterAccountTemplate + Group string `json:"group"` + ClusterAccountTemplates []storagev1.UserClusterAccountTemplate `json:"clusterAccountTemplates,omitempty"` } type AuthenticationMicrosoft struct { - ClientID string - ClientSecret string - RedirectURI string - Tenant string - Groups []string - OnlySecurityGroups bool - UseGroupsAsWhitelist bool - AuthenticationClusterAccountTemplates + ClientID string `json:"clientId"` + ClientSecret string `json:"clientSecret"` + RedirectURI string `json:"redirectURI"` + Tenant string `json:"tenant,omitempty"` + Groups []string `json:"groups,omitempty"` + OnlySecurityGroups bool `json:"onlySecurityGroups,omitempty"` + UseGroupsAsWhitelist bool `json:"useGroupsAsWhitelist,omitempty"` + AuthenticationClusterAccountTemplates `json:",inline"` } type AuthenticationOIDC struct { - IssuerURL string - ClientID string - ClientSecret string - RedirectURI string - PostLogoutRedirectURI string - CAFile string - InsecureCA bool - PreferredUsernameClaim string - LoftUsernameClaim string - UsernameClaim string - EmailClaim string - UsernamePrefix string - GroupsClaim string - Groups []string - Scopes []string - GetUserInfo bool - GroupsPrefix string - Type string - AuthenticationClusterAccountTemplates + IssuerURL string `json:"issuerUrl,omitempty"` + ClientID string `json:"clientId,omitempty"` + ClientSecret string `json:"clientSecret,omitempty"` + RedirectURI string `json:"redirectURI,omitempty"` + PostLogoutRedirectURI string `json:"postLogoutRedirectURI,omitempty"` + CAFile string `json:"caFile,omitempty"` + InsecureCA bool `json:"insecureCa,omitempty"` + PreferredUsernameClaim string `json:"preferredUsername,omitempty"` + LoftUsernameClaim string `json:"loftUsernameClaim,omitempty"` + UsernameClaim string `json:"usernameClaim,omitempty"` + EmailClaim string `json:"emailClaim,omitempty"` + UsernamePrefix string `json:"usernamePrefix,omitempty"` + GroupsClaim string `json:"groupsClaim,omitempty"` + Groups []string `json:"groups,omitempty"` + Scopes []string `json:"scopes,omitempty"` + GetUserInfo bool `json:"getUserInfo,omitempty"` + GroupsPrefix string `json:"groupsPrefix,omitempty"` + Type string `json:"type,omitempty"` + AuthenticationClusterAccountTemplates `json:",inline"` } type AuthenticationPassword struct { - Disabled bool + Disabled bool `json:"disabled,omitempty"` } type AuthenticationRancher struct { - Host string - BearerToken string - Insecure bool + Host string `json:"host,omitempty"` + BearerToken string `json:"bearerToken,omitempty"` + Insecure bool `json:"insecure,omitempty"` } type AuthenticationSAML struct { - RedirectURI string - SSOURL string - CAData []byte - UsernameAttr string - EmailAttr string - GroupsAttr string - CA string - InsecureSkipSignatureValidation bool - EntityIssuer string - SSOIssuer string - GroupsDelim string - AllowedGroups []string - FilterGroups bool - NameIDPolicyFormat string + RedirectURI string `json:"redirectURI,omitempty"` + SSOURL string `json:"ssoURL,omitempty"` + CAData []byte `json:"caData,omitempty"` + UsernameAttr string `json:"usernameAttr,omitempty"` + EmailAttr string `json:"emailAttr,omitempty"` + GroupsAttr string `json:"groupsAttr,omitempty"` + CA string `json:"ca,omitempty"` + InsecureSkipSignatureValidation bool `json:"insecureSkipSignatureValidation,omitempty"` + EntityIssuer string `json:"entityIssuer,omitempty"` + SSOIssuer string `json:"ssoIssuer,omitempty"` + GroupsDelim string `json:"groupsDelim,omitempty"` + AllowedGroups []string `json:"allowedGroups,omitempty"` + FilterGroups bool `json:"filterGroups,omitempty"` + NameIDPolicyFormat string `json:"nameIDPolicyFormat,omitempty"` } // +genclient @@ -1564,40 +1564,40 @@ type AuthenticationSAML struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Backup struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec BackupSpec - Status BackupStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec BackupSpec `json:"spec,omitempty"` + Status BackupStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type BackupApply struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec BackupApplySpec + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec BackupApplySpec `json:"spec,omitempty"` } type BackupApplySpec struct { - Raw string + Raw string `json:"raw,omitempty"` } type BackupSpec struct { } type BackupStatus struct { - RawBackup string + RawBackup string `json:"rawBackup,omitempty"` } // +genclient -// +genclient:nonNamespaced +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Cluster struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ClusterSpec - Status ClusterStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ClusterSpec `json:"spec,omitempty"` + Status ClusterStatus `json:"status,omitempty"` } // +genclient @@ -1605,65 +1605,65 @@ type Cluster struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterAccess struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ClusterAccessSpec - Status ClusterAccessStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ClusterAccessSpec `json:"spec,omitempty"` + Status ClusterAccessStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterAccessKey struct { - metav1.TypeMeta - metav1.ObjectMeta - AccessKey string - LoftHost string - Insecure bool - CaCert string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + AccessKey string `json:"accessKey,omitempty"` + LoftHost string `json:"loftHost,omitempty"` + Insecure bool `json:"insecure,omitempty"` + CaCert string `json:"caCert,omitempty"` } type ClusterAccessSpec struct { - storagev1.ClusterAccessSpec + storagev1.ClusterAccessSpec `json:",inline"` } type ClusterAccessStatus struct { - storagev1.ClusterAccessStatus - Clusters []*clusterv1.EntityInfo - Users []*clusterv1.UserOrTeam - Teams []*clusterv1.EntityInfo - SpaceConstraint *clusterv1.EntityInfo + storagev1.ClusterAccessStatus `json:",inline"` + Clusters []*clusterv1.EntityInfo `json:"clusters,omitempty"` + Users []*clusterv1.UserOrTeam `json:"users,omitempty"` + Teams []*clusterv1.EntityInfo `json:"teams,omitempty"` + SpaceConstraint *clusterv1.EntityInfo `json:"spaceConstraint,omitempty"` } type ClusterAccounts struct { - Accounts []string - Cluster storagev1.Cluster + Accounts []string `json:"accounts,omitempty"` + Cluster storagev1.Cluster `json:"cluster,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterAgentConfig struct { - metav1.TypeMeta - metav1.ObjectMeta - ClusterAgentConfigCommon + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + ClusterAgentConfigCommon `json:",inline"` } type ClusterAgentConfigCommon struct { - Cluster string - Audit *AgentAuditConfig - DefaultImageRegistry string - TokenCaCert []byte - LoftHost string - LoftInstanceID string - AnalyticsSpec AgentAnalyticsSpec + Cluster string `json:"cluster,omitempty"` + Audit *AgentAuditConfig `json:"audit,omitempty"` + DefaultImageRegistry string `json:"defaultImageRegistry,omitempty"` + TokenCaCert []byte `json:"tokenCaCert,omitempty"` + LoftHost string `json:"loftHost,omitempty"` + LoftInstanceID string `json:"loftInstanceID,omitempty"` + AnalyticsSpec AgentAnalyticsSpec `json:"analyticsSpec"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterCharts struct { - metav1.TypeMeta - metav1.ObjectMeta - Charts []storagev1.HelmChart - Busy bool + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Charts []storagev1.HelmChart `json:"charts"` + Busy bool `json:"busy,omitempty"` } // +genclient @@ -1671,62 +1671,62 @@ type ClusterCharts struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterConnect struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ClusterConnectSpec - Status ClusterConnectStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ClusterConnectSpec `json:"spec,omitempty"` + Status ClusterConnectStatus `json:"status,omitempty"` } type ClusterConnectSpec struct { - Config string - AdminUser string - ClusterTemplate Cluster + Config string `json:"config,omitempty"` + AdminUser string `json:"adminUser,omitempty"` + ClusterTemplate Cluster `json:"clusterTemplate,omitempty"` } type ClusterConnectStatus struct { - Failed bool - Reason string - Message string + Failed bool `json:"failed,omitempty"` + Reason string `json:"reason,omitempty"` + Message string `json:"message,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterDomain struct { - metav1.TypeMeta - metav1.ObjectMeta - Target string - Domain string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Target string `json:"target,omitempty"` + Domain string `json:"domain,omitempty"` } type ClusterMember struct { - Info clusterv1.EntityInfo + Info clusterv1.EntityInfo `json:"info,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterMemberAccess struct { - metav1.TypeMeta - metav1.ObjectMeta - Teams []ClusterMember - Users []ClusterMember + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Teams []ClusterMember `json:"teams,omitempty"` + Users []ClusterMember `json:"users,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterMembers struct { - metav1.TypeMeta - metav1.ObjectMeta - Teams []ClusterMember - Users []ClusterMember + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Teams []ClusterMember `json:"teams,omitempty"` + Users []ClusterMember `json:"users,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterReset struct { - metav1.TypeMeta - metav1.ObjectMeta - Agent bool - RBAC bool + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Agent bool `json:"agent,omitempty"` + RBAC bool `json:"rbac,omitempty"` } // +genclient @@ -1734,39 +1734,39 @@ type ClusterReset struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterRoleTemplate struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ClusterRoleTemplateSpec - Status ClusterRoleTemplateStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ClusterRoleTemplateSpec `json:"spec,omitempty"` + Status ClusterRoleTemplateStatus `json:"status,omitempty"` } type ClusterRoleTemplateSpec struct { - storagev1.ClusterRoleTemplateSpec + storagev1.ClusterRoleTemplateSpec `json:",inline"` } type ClusterRoleTemplateStatus struct { - storagev1.ClusterRoleTemplateStatus - Clusters []*clusterv1.EntityInfo + storagev1.ClusterRoleTemplateStatus `json:",inline"` + Clusters []*clusterv1.EntityInfo `json:"clusters,omitempty"` } type ClusterSpec struct { - storagev1.ClusterSpec + storagev1.ClusterSpec `json:",inline"` } type ClusterStatus struct { - storagev1.ClusterStatus - Online bool + storagev1.ClusterStatus `json:",inline"` + Online bool `json:"online,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterVirtualClusterDefaults struct { - metav1.TypeMeta - metav1.ObjectMeta - DefaultTemplate *storagev1.VirtualClusterTemplate - LatestVersion string - Values string - Warning string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + DefaultTemplate *storagev1.VirtualClusterTemplate `json:"defaultTemplate,omitempty"` + LatestVersion string `json:"latestVersion,omitempty"` + Values string `json:"values,omitempty"` + Warning string `json:"warning,omitempty"` } // +genclient @@ -1774,77 +1774,77 @@ type ClusterVirtualClusterDefaults struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Config struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ConfigSpec - Status ConfigStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ConfigSpec `json:"spec,omitempty"` + Status ConfigStatus `json:"status,omitempty"` } type ConfigSpec struct { - Raw []byte + Raw []byte `json:"raw,omitempty"` } type ConfigStatus struct { - Authentication Authentication - OIDC *OIDC - Apps *Apps - Audit *Audit - LoftHost string - DevPodSubDomain string - UISettings *uiv1.UISettingsConfig - VaultIntegration *storagev1.VaultIntegrationSpec + Authentication Authentication `json:"auth,omitempty"` + OIDC *OIDC `json:"oidc,omitempty"` + Apps *Apps `json:"apps,omitempty"` + Audit *Audit `json:"audit,omitempty"` + LoftHost string `json:"loftHost,omitempty"` + DevPodSubDomain string `json:"devPodSubDomain,omitempty"` + UISettings *uiv1.UISettingsConfig `json:"uiSettings,omitempty"` + VaultIntegration *storagev1.VaultIntegrationSpec `json:"vault,omitempty"` } type Connector struct { - OIDC *AuthenticationOIDC - Github *AuthenticationGithub - Gitlab *AuthenticationGitlab - Google *AuthenticationGoogle - Microsoft *AuthenticationMicrosoft - SAML *AuthenticationSAML + OIDC *AuthenticationOIDC `json:"oidc,omitempty"` + Github *AuthenticationGithub `json:"github,omitempty"` + Gitlab *AuthenticationGitlab `json:"gitlab,omitempty"` + Google *AuthenticationGoogle `json:"google,omitempty"` + Microsoft *AuthenticationMicrosoft `json:"microsoft,omitempty"` + SAML *AuthenticationSAML `json:"saml,omitempty"` } type ConnectorWithName struct { - ID string - DisplayName string - Connector + ID string `json:"id,omitempty"` + DisplayName string `json:"displayName,omitempty"` + Connector `json:",inline"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodDeleteOptions struct { - metav1.TypeMeta - Options string + metav1.TypeMeta `json:",inline"` + Options string `json:"options,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodSshOptions struct { - metav1.TypeMeta - Options string + metav1.TypeMeta `json:",inline"` + Options string `json:"options,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodStatusOptions struct { - metav1.TypeMeta - Options string + metav1.TypeMeta `json:",inline"` + Options string `json:"options,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodStopOptions struct { - metav1.TypeMeta - Options string + metav1.TypeMeta `json:",inline"` + Options string `json:"options,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodUpOptions struct { - metav1.TypeMeta - WebMode bool - Debug bool - Options string + metav1.TypeMeta `json:",inline"` + WebMode bool `json:"webMode,omitempty"` + Debug bool `json:"debug,omitempty"` + Options string `json:"options,omitempty"` } // +genclient @@ -1852,27 +1852,27 @@ type DevPodUpOptions struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodWorkspaceInstance struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec DevPodWorkspaceInstanceSpec - Status DevPodWorkspaceInstanceStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec DevPodWorkspaceInstanceSpec `json:"spec,omitempty"` + Status DevPodWorkspaceInstanceStatus `json:"status,omitempty"` } type DevPodWorkspaceInstanceSpec struct { - storagev1.DevPodWorkspaceInstanceSpec + storagev1.DevPodWorkspaceInstanceSpec `json:",inline"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodWorkspaceInstanceState struct { - metav1.TypeMeta - metav1.ObjectMeta - State string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + State string `json:"state,omitempty"` } type DevPodWorkspaceInstanceStatus struct { - storagev1.DevPodWorkspaceInstanceStatus - SleepModeConfig *clusterv1.SleepModeConfig + storagev1.DevPodWorkspaceInstanceStatus `json:",inline"` + SleepModeConfig *clusterv1.SleepModeConfig `json:"sleepModeConfig,omitempty"` } // +genclient @@ -1880,18 +1880,18 @@ type DevPodWorkspaceInstanceStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodWorkspaceTemplate struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec DevPodWorkspaceTemplateSpec - Status DevPodWorkspaceTemplateStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec DevPodWorkspaceTemplateSpec `json:"spec,omitempty"` + Status DevPodWorkspaceTemplateStatus `json:"status,omitempty"` } type DevPodWorkspaceTemplateSpec struct { - storagev1.DevPodWorkspaceTemplateSpec + storagev1.DevPodWorkspaceTemplateSpec `json:",inline"` } type DevPodWorkspaceTemplateStatus struct { - storagev1.DevPodWorkspaceTemplateStatus + storagev1.DevPodWorkspaceTemplateStatus `json:",inline"` } // +genclient @@ -1899,19 +1899,19 @@ type DevPodWorkspaceTemplateStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DirectClusterEndpointToken struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec DirectClusterEndpointTokenSpec - Status DirectClusterEndpointTokenStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec DirectClusterEndpointTokenSpec `json:"spec,omitempty"` + Status DirectClusterEndpointTokenStatus `json:"status,omitempty"` } type DirectClusterEndpointTokenSpec struct { - TTL int64 - Scope *storagev1.AccessKeyScope + TTL int64 `json:"ttl,omitempty"` + Scope *storagev1.AccessKeyScope `json:"scope,omitempty"` } type DirectClusterEndpointTokenStatus struct { - Token string + Token string `json:"token,omitempty"` } // +genclient @@ -1919,17 +1919,17 @@ type DirectClusterEndpointTokenStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Event struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec EventSpec - Status EventStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec EventSpec `json:"spec,omitempty"` + Status EventStatus `json:"status,omitempty"` } type EventSpec struct { } type EventStatus struct { - auditv1.Event + auditv1.Event `json:",inline"` } // +genclient @@ -1937,25 +1937,25 @@ type EventStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Feature struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec FeatureSpec - Status FeatureStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec FeatureSpec `json:"spec,omitempty"` + Status FeatureStatus `json:"status,omitempty"` } type FeatureSpec struct { } type FeatureStatus struct { - pkglicenseapi.Feature - Internal bool - Used bool + pkglicenseapi.Feature `json:",inline"` + Internal bool `json:"internal,omitempty"` + Used bool `json:"used,omitempty"` } type GroupResources struct { - Group string - Resources []string - ResourceNames []string + Group string `json:"group,omitempty" protobuf:"bytes,1,opt,name=group"` + Resources []string `json:"resources,omitempty" protobuf:"bytes,2,rep,name=resources"` + ResourceNames []string `json:"resourceNames,omitempty" protobuf:"bytes,3,rep,name=resourceNames"` } // +genclient @@ -1963,19 +1963,19 @@ type GroupResources struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type IngressAuthToken struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec IngressAuthTokenSpec - Status IngressAuthTokenStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec IngressAuthTokenSpec `json:"spec,omitempty"` + Status IngressAuthTokenStatus `json:"status,omitempty"` } type IngressAuthTokenSpec struct { - Host string - Signature string + Host string `json:"host,omitempty"` + Signature string `json:"signature,omitempty"` } type IngressAuthTokenStatus struct { - Token string + Token string `json:"token,omitempty"` } // +genclient @@ -1983,30 +1983,30 @@ type IngressAuthTokenStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Kiosk struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec KioskSpec - Status KioskStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec KioskSpec `json:"spec,omitempty"` + Status KioskStatus `json:"status,omitempty"` } type KioskSpec struct { - JsPolicy policyv1beta1.JsPolicy - JsPolicyBundle policyv1beta1.JsPolicyBundle - JsPolicyViolations policyv1beta1.JsPolicyViolations - HelmRelease clusterv1.HelmRelease - SleepModeConfig clusterv1.SleepModeConfig - Space clusterv1.Space - VirtualCluster clusterv1.VirtualCluster - LocalClusterAccess clusterv1.LocalClusterAccess - ClusterQuota clusterv1.ClusterQuota - ChartInfo clusterv1.ChartInfo - StorageClusterAccess agentstoragev1.LocalClusterAccess - StorageClusterQuota agentstoragev1.ClusterQuota - StorageVirtualCluster agentstoragev1.VirtualCluster - LocalUser agentstoragev1.LocalUser - LocalTeam agentstoragev1.LocalTeam - UISettings uiv1.UISettings - License License + JsPolicy policyv1beta1.JsPolicy `json:"jsPolicy,omitempty"` + JsPolicyBundle policyv1beta1.JsPolicyBundle `json:"jsPolicyBundle,omitempty"` + JsPolicyViolations policyv1beta1.JsPolicyViolations `json:"jsPolicyViolations,omitempty"` + HelmRelease clusterv1.HelmRelease `json:"helmRelease,omitempty"` + SleepModeConfig clusterv1.SleepModeConfig `json:"sleepModeConfig,omitempty"` + Space clusterv1.Space `json:"space,omitempty"` + VirtualCluster clusterv1.VirtualCluster `json:"virtualCluster,omitempty"` + LocalClusterAccess clusterv1.LocalClusterAccess `json:"localClusterAccess,omitempty"` + ClusterQuota clusterv1.ClusterQuota `json:"clusterQuota,omitempty"` + ChartInfo clusterv1.ChartInfo `json:"chartInfo,omitempty"` + StorageClusterAccess agentstoragev1.LocalClusterAccess `json:"localStorageClusterAccess,omitempty"` + StorageClusterQuota agentstoragev1.ClusterQuota `json:"storageClusterQuota,omitempty"` + StorageVirtualCluster agentstoragev1.VirtualCluster `json:"storageVirtualCluster,omitempty"` + LocalUser agentstoragev1.LocalUser `json:"localUser,omitempty"` + LocalTeam agentstoragev1.LocalTeam `json:"localTeam,omitempty"` + UISettings uiv1.UISettings `json:"UISettings,omitempty"` + License License `json:"license,omitempty"` } type KioskStatus struct { @@ -2017,36 +2017,36 @@ type KioskStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type License struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec LicenseSpec - Status LicenseStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec LicenseSpec `json:"spec,omitempty"` + Status LicenseStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LicenseRequest struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec LicenseRequestSpec - Status LicenseRequestStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec LicenseRequestSpec `json:"spec,omitempty"` + Status LicenseRequestStatus `json:"status,omitempty"` } type LicenseRequestSpec struct { - URL string - Input pkglicenseapi.GenericRequestInput + URL string `json:"url,omitempty"` + Input pkglicenseapi.GenericRequestInput `json:"input,omitempty"` } type LicenseRequestStatus struct { - Output *pkglicenseapi.GenericRequestOutput + Output *pkglicenseapi.GenericRequestOutput `json:"output,omitempty"` } type LicenseSpec struct { } type LicenseStatus struct { - License *pkglicenseapi.License - ResourceUsage map[string]pkglicenseapi.ResourceCount + License *pkglicenseapi.License `json:"license,omitempty"` + ResourceUsage map[string]pkglicenseapi.ResourceCount `json:"resourceUsage,omitempty"` } // +genclient @@ -2054,19 +2054,19 @@ type LicenseStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LicenseToken struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec LicenseTokenSpec - Status LicenseTokenStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec LicenseTokenSpec `json:"spec,omitempty"` + Status LicenseTokenStatus `json:"status,omitempty"` } type LicenseTokenSpec struct { - URL string - Payload string + URL string `json:"url,omitempty"` + Payload string `json:"payload,omitempty"` } type LicenseTokenStatus struct { - Token *pkglicenseapi.InstanceTokenAuth + Token *pkglicenseapi.InstanceTokenAuth `json:"token,omitempty"` } // +genclient @@ -2074,32 +2074,32 @@ type LicenseTokenStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LoftUpgrade struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec LoftUpgradeSpec - Status LoftUpgradeStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec LoftUpgradeSpec `json:"spec,omitempty"` + Status LoftUpgradeStatus `json:"status,omitempty"` } type LoftUpgradeSpec struct { - Namespace string - Release string - Version string + Namespace string `json:"namespace,omitempty"` + Release string `json:"release,omitempty"` + Version string `json:"version,omitempty"` } type LoftUpgradeStatus struct { } type OIDC struct { - Enabled bool - WildcardRedirect bool - Clients []OIDCClient + Enabled bool `json:"enabled,omitempty"` + WildcardRedirect bool `json:"wildcardRedirect,omitempty"` + Clients []OIDCClient `json:"clients,omitempty"` } type OIDCClient struct { - Name string - ClientID string - ClientSecret string - RedirectURIs []string + Name string `json:"name,omitempty"` + ClientID string `json:"clientId,omitempty"` + ClientSecret string `json:"clientSecret,omitempty"` + RedirectURIs []string `json:"redirectURIs"` } // +genclient @@ -2107,18 +2107,18 @@ type OIDCClient struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type OwnedAccessKey struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec OwnedAccessKeySpec - Status OwnedAccessKeyStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec OwnedAccessKeySpec `json:"spec,omitempty"` + Status OwnedAccessKeyStatus `json:"status,omitempty"` } type OwnedAccessKeySpec struct { - storagev1.AccessKeySpec + storagev1.AccessKeySpec `json:",inline"` } type OwnedAccessKeyStatus struct { - storagev1.AccessKeyStatus + storagev1.AccessKeyStatus `json:",inline"` } // +genclient @@ -2126,30 +2126,30 @@ type OwnedAccessKeyStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type PolicyViolation struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec PolicyViolationSpec - Status PolicyViolationStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec PolicyViolationSpec `json:"spec,omitempty"` + Status PolicyViolationStatus `json:"status,omitempty"` } type PolicyViolationSpec struct { } type PolicyViolationStatus struct { - Policy string - Cluster string - User *clusterv1.EntityInfo - Violation policyv1beta1.PolicyViolation + Policy string `json:"policy,omitempty"` + Cluster string `json:"cluster,omitempty"` + User *clusterv1.EntityInfo `json:"user,omitempty"` + Violation policyv1beta1.PolicyViolation `json:"violation,omitempty"` } type PredefinedApp struct { - Chart string - InitialVersion string - InitialValues string - Clusters []string - Title string - IconURL string - ReadmeURL string + Chart string `json:"chart"` + InitialVersion string `json:"initialVersion,omitempty"` + InitialValues string `json:"initialValues,omitempty"` + Clusters []string `json:"clusters,omitempty"` + Title string `json:"title,omitempty"` + IconURL string `json:"iconUrl,omitempty"` + ReadmeURL string `json:"readmeUrl,omitempty"` } // +genclient @@ -2157,116 +2157,116 @@ type PredefinedApp struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Project struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ProjectSpec - Status ProjectStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ProjectSpec `json:"spec,omitempty"` + Status ProjectStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectChartInfo struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ProjectChartInfoSpec - Status ProjectChartInfoStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ProjectChartInfoSpec `json:"spec,omitempty"` + Status ProjectChartInfoStatus `json:"status,omitempty"` } type ProjectChartInfoSpec struct { - clusterv1.ChartInfoSpec + clusterv1.ChartInfoSpec `json:",inline"` } type ProjectChartInfoStatus struct { - clusterv1.ChartInfoStatus + clusterv1.ChartInfoStatus `json:",inline"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectCharts struct { - metav1.TypeMeta - metav1.ObjectMeta - Charts []storagev1.HelmChart - Busy bool + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Charts []storagev1.HelmChart `json:"charts"` + Busy bool `json:"busy,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectClusters struct { - metav1.TypeMeta - metav1.ObjectMeta - Clusters []Cluster - Runners []Runner + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Clusters []Cluster `json:"clusters,omitempty"` + Runners []Runner `json:"runners,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectImportSpace struct { - metav1.TypeMeta - metav1.ObjectMeta - SourceSpace ProjectImportSpaceSource + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + SourceSpace ProjectImportSpaceSource `json:"sourceSpace"` } type ProjectImportSpaceSource struct { - Name string - Cluster string - ImportName string + Name string `json:"name,omitempty"` + Cluster string `json:"cluster,omitempty"` + ImportName string `json:"importName,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectImportVirtualCluster struct { - metav1.TypeMeta - metav1.ObjectMeta - SourceVirtualCluster ProjectImportVirtualClusterSource - UpgradeToPro bool - SkipHelmDeploy bool + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + SourceVirtualCluster ProjectImportVirtualClusterSource `json:"sourceVirtualCluster"` + UpgradeToPro bool `json:"upgradeToPro,omitempty"` + SkipHelmDeploy bool `json:"skipHelmDeploy,omitempty"` } type ProjectImportVirtualClusterSource struct { - Name string - Namespace string - Cluster string - Owner *storagev1.UserOrTeam - ImportName string + Name string `json:"name,omitempty"` + Namespace string `json:"namespace,omitempty"` + Cluster string `json:"cluster,omitempty"` + Owner *storagev1.UserOrTeam `json:"owner,omitempty"` + ImportName string `json:"importName,omitempty"` } type ProjectMember struct { - Info clusterv1.EntityInfo + Info clusterv1.EntityInfo `json:"info,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectMembers struct { - metav1.TypeMeta - metav1.ObjectMeta - Teams []ProjectMember - Users []ProjectMember + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Teams []ProjectMember `json:"teams,omitempty"` + Users []ProjectMember `json:"users,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectMigrateSpaceInstance struct { - metav1.TypeMeta - metav1.ObjectMeta - SourceSpaceInstance ProjectMigrateSpaceInstanceSource + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + SourceSpaceInstance ProjectMigrateSpaceInstanceSource `json:"sourceSpaceInstance"` } type ProjectMigrateSpaceInstanceSource struct { - Name string - Namespace string + Name string `json:"name,omitempty"` + Namespace string `json:"namespace,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectMigrateVirtualClusterInstance struct { - metav1.TypeMeta - metav1.ObjectMeta - SourceVirtualClusterInstance ProjectMigrateVirtualClusterInstanceSource + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + SourceVirtualClusterInstance ProjectMigrateVirtualClusterInstanceSource `json:"sourceVirtualClusterInstance"` } type ProjectMigrateVirtualClusterInstanceSource struct { - Name string - Namespace string + Name string `json:"name,omitempty"` + Namespace string `json:"namespace,omitempty"` } // +genclient @@ -2274,43 +2274,43 @@ type ProjectMigrateVirtualClusterInstanceSource struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectSecret struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ProjectSecretSpec - Status ProjectSecretStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ProjectSecretSpec `json:"spec,omitempty"` + Status ProjectSecretStatus `json:"status,omitempty"` } type ProjectSecretSpec struct { - DisplayName string - Description string - Owner *storagev1.UserOrTeam - Data map[string][]byte - Access []storagev1.Access + DisplayName string `json:"displayName,omitempty"` + Description string `json:"description,omitempty"` + Owner *storagev1.UserOrTeam `json:"owner,omitempty"` + Data map[string][]byte `json:"data,omitempty"` + Access []storagev1.Access `json:"access,omitempty"` } type ProjectSecretStatus struct { - Conditions agentstoragev1.Conditions + Conditions agentstoragev1.Conditions `json:"conditions,omitempty"` } type ProjectSpec struct { - storagev1.ProjectSpec + storagev1.ProjectSpec `json:",inline"` } type ProjectStatus struct { - storagev1.ProjectStatus + storagev1.ProjectStatus `json:",inline"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectTemplates struct { - metav1.TypeMeta - metav1.ObjectMeta - DefaultVirtualClusterTemplate string - VirtualClusterTemplates []VirtualClusterTemplate - DefaultSpaceTemplate string - SpaceTemplates []SpaceTemplate - DefaultDevPodWorkspaceTemplate string - DevPodWorkspaceTemplates []DevPodWorkspaceTemplate + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + DefaultVirtualClusterTemplate string `json:"defaultVirtualClusterTemplate,omitempty"` + VirtualClusterTemplates []VirtualClusterTemplate `json:"virtualClusterTemplates,omitempty"` + DefaultSpaceTemplate string `json:"defaultSpaceTemplate,omitempty"` + SpaceTemplates []SpaceTemplate `json:"spaceTemplates,omitempty"` + DefaultDevPodWorkspaceTemplate string `json:"defaultDevPodWorkspaceTemplate,omitempty"` + DevPodWorkspaceTemplates []DevPodWorkspaceTemplate `json:"devPodWorkspaceTemplates,omitempty"` } // +genclient @@ -2318,18 +2318,18 @@ type ProjectTemplates struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type RedirectToken struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec RedirectTokenSpec - Status RedirectTokenStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec RedirectTokenSpec `json:"spec,omitempty"` + Status RedirectTokenStatus `json:"status,omitempty"` } type RedirectTokenSpec struct { - Token string + Token string `json:"token,omitempty"` } type RedirectTokenStatus struct { - RedirectURL string + RedirectURL string `json:"redirectURL,omitempty"` } // +genclient @@ -2337,18 +2337,18 @@ type RedirectTokenStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ResetAccessKey struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec ResetAccessKeySpec - Status ResetAccessKeyStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec ResetAccessKeySpec `json:"spec,omitempty"` + Status ResetAccessKeyStatus `json:"status,omitempty"` } type ResetAccessKeySpec struct { - storagev1.AccessKeySpec + storagev1.AccessKeySpec `json:",inline"` } type ResetAccessKeyStatus struct { - storagev1.AccessKeyStatus + storagev1.AccessKeyStatus `json:",inline"` } // +genclient @@ -2356,34 +2356,34 @@ type ResetAccessKeyStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Runner struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec RunnerSpec - Status RunnerStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec RunnerSpec `json:"spec,omitempty"` + Status RunnerStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type RunnerAccessKey struct { - metav1.TypeMeta - metav1.ObjectMeta - AccessKey string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + AccessKey string `json:"accessKey,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type RunnerConfig struct { - metav1.TypeMeta - metav1.ObjectMeta - TokenCaCert []byte + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + TokenCaCert []byte `json:"tokenCaCert,omitempty"` } type RunnerSpec struct { - storagev1.RunnerSpec + storagev1.RunnerSpec `json:",inline"` } type RunnerStatus struct { - storagev1.RunnerStatus + storagev1.RunnerStatus `json:",inline"` } // +genclient @@ -2391,27 +2391,27 @@ type RunnerStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Self struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SelfSpec - Status SelfStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SelfSpec `json:"spec,omitempty"` + Status SelfStatus `json:"status,omitempty"` } type SelfSpec struct { - AccessKey string + AccessKey string `json:"accessKey,omitempty"` } type SelfStatus struct { - User *UserInfo - Team *clusterv1.EntityInfo - AccessKey string - AccessKeyScope *storagev1.AccessKeyScope - AccessKeyType storagev1.AccessKeyType - Subject string - UID string - Groups []string - ChatAuthToken string - InstanceID string + User *UserInfo `json:"user,omitempty"` + Team *clusterv1.EntityInfo `json:"team,omitempty"` + AccessKey string `json:"accessKey,omitempty"` + AccessKeyScope *storagev1.AccessKeyScope `json:"accessKeyScope,omitempty"` + AccessKeyType storagev1.AccessKeyType `json:"accessKeyType,omitempty"` + Subject string `json:"subject,omitempty"` + UID string `json:"uid,omitempty"` + Groups []string `json:"groups,omitempty"` + ChatAuthToken string `json:"chatAuthToken"` + InstanceID string `json:"instanceID"` } // +genclient @@ -2419,18 +2419,18 @@ type SelfStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SelfSubjectAccessReview struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SelfSubjectAccessReviewSpec - Status SelfSubjectAccessReviewStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SelfSubjectAccessReviewSpec `json:"spec,omitempty"` + Status SelfSubjectAccessReviewStatus `json:"status,omitempty"` } type SelfSubjectAccessReviewSpec struct { - authorizationv1.SelfSubjectAccessReviewSpec + authorizationv1.SelfSubjectAccessReviewSpec `json:",inline"` } type SelfSubjectAccessReviewStatus struct { - authorizationv1.SubjectAccessReviewStatus + authorizationv1.SubjectAccessReviewStatus `json:",inline"` } // +genclient @@ -2438,18 +2438,18 @@ type SelfSubjectAccessReviewStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SharedSecret struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SharedSecretSpec - Status SharedSecretStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SharedSecretSpec `json:"spec,omitempty"` + Status SharedSecretStatus `json:"status,omitempty"` } type SharedSecretSpec struct { - storagev1.SharedSecretSpec + storagev1.SharedSecretSpec `json:",inline"` } type SharedSecretStatus struct { - storagev1.SharedSecretStatus + storagev1.SharedSecretStatus `json:",inline"` } // +genclient @@ -2457,20 +2457,20 @@ type SharedSecretStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SpaceConstraint struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SpaceConstraintSpec - Status SpaceConstraintStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SpaceConstraintSpec `json:"spec,omitempty"` + Status SpaceConstraintStatus `json:"status,omitempty"` } type SpaceConstraintSpec struct { - storagev1.SpaceConstraintSpec + storagev1.SpaceConstraintSpec `json:",inline"` } type SpaceConstraintStatus struct { - storagev1.SpaceConstraintStatus - ClusterRole *clusterv1.EntityInfo - Clusters []*clusterv1.EntityInfo + storagev1.SpaceConstraintStatus `json:",inline"` + ClusterRole *clusterv1.EntityInfo `json:"clusterRole,omitempty"` + Clusters []*clusterv1.EntityInfo `json:"clusters,omitempty"` } // +genclient @@ -2478,21 +2478,21 @@ type SpaceConstraintStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SpaceInstance struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SpaceInstanceSpec - Status SpaceInstanceStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SpaceInstanceSpec `json:"spec,omitempty"` + Status SpaceInstanceStatus `json:"status,omitempty"` } type SpaceInstanceSpec struct { - storagev1.SpaceInstanceSpec + storagev1.SpaceInstanceSpec `json:",inline"` } type SpaceInstanceStatus struct { - storagev1.SpaceInstanceStatus - SleepModeConfig *clusterv1.SleepModeConfig - CanUse bool - CanUpdate bool + storagev1.SpaceInstanceStatus `json:",inline"` + SleepModeConfig *clusterv1.SleepModeConfig `json:"sleepModeConfig,omitempty"` + CanUse bool `json:"canUse,omitempty"` + CanUpdate bool `json:"canUpdate,omitempty"` } // +genclient @@ -2500,19 +2500,19 @@ type SpaceInstanceStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SpaceTemplate struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SpaceTemplateSpec - Status SpaceTemplateStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SpaceTemplateSpec `json:"spec,omitempty"` + Status SpaceTemplateStatus `json:"status,omitempty"` } type SpaceTemplateSpec struct { - storagev1.SpaceTemplateSpec + storagev1.SpaceTemplateSpec `json:",inline"` } type SpaceTemplateStatus struct { - storagev1.SpaceTemplateStatus - Apps []*clusterv1.EntityInfo + storagev1.SpaceTemplateStatus `json:",inline"` + Apps []*clusterv1.EntityInfo `json:"apps,omitempty"` } // +genclient @@ -2520,18 +2520,18 @@ type SpaceTemplateStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SubjectAccessReview struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec SubjectAccessReviewSpec - Status SubjectAccessReviewStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec SubjectAccessReviewSpec `json:"spec,omitempty"` + Status SubjectAccessReviewStatus `json:"status,omitempty"` } type SubjectAccessReviewSpec struct { - authorizationv1.SubjectAccessReviewSpec + authorizationv1.SubjectAccessReviewSpec `json:",inline"` } type SubjectAccessReviewStatus struct { - authorizationv1.SubjectAccessReviewStatus + authorizationv1.SubjectAccessReviewStatus `json:",inline"` } // +genclient @@ -2539,27 +2539,27 @@ type SubjectAccessReviewStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Task struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec TaskSpec - Status TaskStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec TaskSpec `json:"spec,omitempty"` + Status TaskStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TaskLog struct { - metav1.TypeMeta - metav1.ObjectMeta + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` } type TaskSpec struct { - storagev1.TaskSpec + storagev1.TaskSpec `json:",inline"` } type TaskStatus struct { - storagev1.TaskStatus - Owner *clusterv1.UserOrTeam - Cluster *clusterv1.EntityInfo + storagev1.TaskStatus `json:",inline"` + Owner *clusterv1.UserOrTeam `json:"owner,omitempty"` + Cluster *clusterv1.EntityInfo `json:"cluster,omitempty"` } // +genclient @@ -2567,34 +2567,34 @@ type TaskStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Team struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec TeamSpec - Status TeamStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec TeamSpec `json:"spec,omitempty"` + Status TeamStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TeamAccessKeys struct { - metav1.TypeMeta - metav1.ObjectMeta - AccessKeys []OwnedAccessKey + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + AccessKeys []OwnedAccessKey `json:"accessKeys,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TeamClusters struct { - metav1.TypeMeta - metav1.ObjectMeta - Clusters []ClusterAccounts + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Clusters []ClusterAccounts `json:"clusters,omitempty"` } type TeamSpec struct { - storagev1.TeamSpec + storagev1.TeamSpec `json:",inline"` } type TeamStatus struct { - storagev1.TeamStatus + storagev1.TeamStatus `json:",inline"` } // +genclient @@ -2602,69 +2602,69 @@ type TeamStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type User struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec UserSpec - Status UserStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec UserSpec `json:"spec,omitempty"` + Status UserStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserAccessKeys struct { - metav1.TypeMeta - metav1.ObjectMeta - AccessKeys []OwnedAccessKey + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + AccessKeys []OwnedAccessKey `json:"accessKeys,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserClusters struct { - metav1.TypeMeta - metav1.ObjectMeta - Clusters []ClusterAccounts + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Clusters []ClusterAccounts `json:"clusters,omitempty"` } type UserInfo struct { - clusterv1.EntityInfo - Teams []*clusterv1.EntityInfo + clusterv1.EntityInfo `json:",inline"` + Teams []*clusterv1.EntityInfo `json:"teams,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserPermissions struct { - metav1.TypeMeta - metav1.ObjectMeta - ClusterRoles []UserPermissionsRole - NamespaceRoles []UserPermissionsRole + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + ClusterRoles []UserPermissionsRole `json:"clusterRoles,omitempty"` + NamespaceRoles []UserPermissionsRole `json:"namespaceRoles,omitempty"` } type UserPermissionsRole struct { - ClusterRole string - Role string - Namespace string - Rules []rbacv1.PolicyRule + ClusterRole string `json:"clusterRole,omitempty"` + Role string `json:"role,omitempty"` + Namespace string `json:"namespace,omitempty"` + Rules []rbacv1.PolicyRule `json:"rules,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserProfile struct { - metav1.TypeMeta - metav1.ObjectMeta - DisplayName string - Username string - Password string - CurrentPassword string - Email string - Icon *string - Custom string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + DisplayName string `json:"displayName,omitempty"` + Username string `json:"username,omitempty"` + Password string `json:"password,omitempty"` + CurrentPassword string `json:"currentPassword,omitempty"` + Email string `json:"email,omitempty"` + Icon *string `json:"icon,omitempty"` + Custom string `json:"custom,omitempty"` } type UserSpec struct { - storagev1.UserSpec + storagev1.UserSpec `json:",inline"` } type UserStatus struct { - storagev1.UserStatus + storagev1.UserStatus `json:",inline"` } // +genclient @@ -2672,54 +2672,54 @@ type UserStatus struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstance struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec VirtualClusterInstanceSpec - Status VirtualClusterInstanceStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec VirtualClusterInstanceSpec `json:"spec,omitempty"` + Status VirtualClusterInstanceStatus `json:"status,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstanceKubeConfig struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec VirtualClusterInstanceKubeConfigSpec - Status VirtualClusterInstanceKubeConfigStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec VirtualClusterInstanceKubeConfigSpec `json:"spec,omitempty"` + Status VirtualClusterInstanceKubeConfigStatus `json:"status,omitempty"` } type VirtualClusterInstanceKubeConfigSpec struct { - CertificateTTL *int32 + CertificateTTL *int32 `json:"certificateTTL,omitempty"` } type VirtualClusterInstanceKubeConfigStatus struct { - KubeConfig string + KubeConfig string `json:"kubeConfig,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstanceLog struct { - metav1.TypeMeta - metav1.ObjectMeta + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` } type VirtualClusterInstanceSpec struct { - storagev1.VirtualClusterInstanceSpec + storagev1.VirtualClusterInstanceSpec `json:",inline"` } type VirtualClusterInstanceStatus struct { - storagev1.VirtualClusterInstanceStatus - SleepModeConfig *clusterv1.SleepModeConfig - CanUse bool - CanUpdate bool + storagev1.VirtualClusterInstanceStatus `json:",inline"` + SleepModeConfig *clusterv1.SleepModeConfig `json:"sleepModeConfig,omitempty"` + CanUse bool `json:"canUse,omitempty"` + CanUpdate bool `json:"canUpdate,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstanceWorkloadKubeConfig struct { - metav1.TypeMeta - metav1.ObjectMeta - KubeConfig string - Token string + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + KubeConfig string `json:"kubeConfig,omitempty"` + Token string `json:"token,omitempty"` } // +genclient @@ -2727,19 +2727,19 @@ type VirtualClusterInstanceWorkloadKubeConfig struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterTemplate struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec VirtualClusterTemplateSpec - Status VirtualClusterTemplateStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec VirtualClusterTemplateSpec `json:"spec,omitempty"` + Status VirtualClusterTemplateStatus `json:"status,omitempty"` } type VirtualClusterTemplateSpec struct { - storagev1.VirtualClusterTemplateSpec + storagev1.VirtualClusterTemplateSpec `json:",inline"` } type VirtualClusterTemplateStatus struct { - storagev1.VirtualClusterTemplateStatus - Apps []*clusterv1.EntityInfo + storagev1.VirtualClusterTemplateStatus `json:",inline"` + Apps []*clusterv1.EntityInfo `json:"apps,omitempty"` } // AgentAuditEvent Functions and Structs @@ -2757,9 +2757,9 @@ type AgentAuditEventStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type AgentAuditEventList struct { - metav1.TypeMeta - metav1.ListMeta - Items []AgentAuditEvent + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []AgentAuditEvent `json:"items"` } func (AgentAuditEvent) NewStatus() interface{} { @@ -2876,9 +2876,9 @@ type AnnouncementStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type AnnouncementList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Announcement + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Announcement `json:"items"` } func (Announcement) NewStatus() interface{} { @@ -2995,17 +2995,17 @@ type AppStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type AppList struct { - metav1.TypeMeta - metav1.ListMeta - Items []App + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []App `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type AppCredentialsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []AppCredentials + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []AppCredentials `json:"items"` } func (App) NewStatus() interface{} { @@ -3122,17 +3122,17 @@ type BackupStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type BackupList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Backup + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Backup `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type BackupApplyList struct { - metav1.TypeMeta - metav1.ListMeta - Items []BackupApply + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []BackupApply `json:"items"` } func (Backup) NewStatus() interface{} { @@ -3249,73 +3249,73 @@ type ClusterStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Cluster + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Cluster `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterAccessKeyList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterAccessKey + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterAccessKey `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterAgentConfigList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterAgentConfig + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterAgentConfig `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterChartsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterCharts + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterCharts `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterDomainList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterDomain + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterDomain `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterMemberAccessList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterMemberAccess + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterMemberAccess `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterMembersList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterMembers + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterMembers `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterResetList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterReset + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterReset `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterVirtualClusterDefaultsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterVirtualClusterDefaults + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterVirtualClusterDefaults `json:"items"` } func (Cluster) NewStatus() interface{} { @@ -3432,9 +3432,9 @@ type ClusterAccessStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterAccessList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterAccess + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterAccess `json:"items"` } func (ClusterAccess) NewStatus() interface{} { @@ -3551,9 +3551,9 @@ type ClusterConnectStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterConnectList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterConnect + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterConnect `json:"items"` } func (ClusterConnect) NewStatus() interface{} { @@ -3670,9 +3670,9 @@ type ClusterRoleTemplateStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterRoleTemplateList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ClusterRoleTemplate + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterRoleTemplate `json:"items"` } func (ClusterRoleTemplate) NewStatus() interface{} { @@ -3789,9 +3789,9 @@ type ConfigStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ConfigList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Config + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Config `json:"items"` } func (Config) NewStatus() interface{} { @@ -3908,57 +3908,57 @@ type DevPodWorkspaceInstanceStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodWorkspaceInstanceList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodWorkspaceInstance + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodWorkspaceInstance `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodDeleteOptionsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodDeleteOptions + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodDeleteOptions `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodStatusOptionsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodStatusOptions + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodStatusOptions `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodSshOptionsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodSshOptions + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodSshOptions `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodWorkspaceInstanceStateList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodWorkspaceInstanceState + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodWorkspaceInstanceState `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodStopOptionsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodStopOptions + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodStopOptions `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodUpOptionsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodUpOptions + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodUpOptions `json:"items"` } func (DevPodWorkspaceInstance) NewStatus() interface{} { @@ -4075,9 +4075,9 @@ type DevPodWorkspaceTemplateStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DevPodWorkspaceTemplateList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DevPodWorkspaceTemplate + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevPodWorkspaceTemplate `json:"items"` } func (DevPodWorkspaceTemplate) NewStatus() interface{} { @@ -4194,9 +4194,9 @@ type DirectClusterEndpointTokenStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type DirectClusterEndpointTokenList struct { - metav1.TypeMeta - metav1.ListMeta - Items []DirectClusterEndpointToken + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DirectClusterEndpointToken `json:"items"` } func (DirectClusterEndpointToken) NewStatus() interface{} { @@ -4313,9 +4313,9 @@ type EventStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type EventList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Event + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Event `json:"items"` } func (Event) NewStatus() interface{} { @@ -4432,9 +4432,9 @@ type FeatureStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type FeatureList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Feature + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Feature `json:"items"` } func (Feature) NewStatus() interface{} { @@ -4551,9 +4551,9 @@ type IngressAuthTokenStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type IngressAuthTokenList struct { - metav1.TypeMeta - metav1.ListMeta - Items []IngressAuthToken + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []IngressAuthToken `json:"items"` } func (IngressAuthToken) NewStatus() interface{} { @@ -4670,9 +4670,9 @@ type KioskStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type KioskList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Kiosk + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Kiosk `json:"items"` } func (Kiosk) NewStatus() interface{} { @@ -4789,17 +4789,17 @@ type LicenseStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LicenseList struct { - metav1.TypeMeta - metav1.ListMeta - Items []License + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []License `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LicenseRequestList struct { - metav1.TypeMeta - metav1.ListMeta - Items []LicenseRequest + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []LicenseRequest `json:"items"` } func (License) NewStatus() interface{} { @@ -4916,9 +4916,9 @@ type LicenseTokenStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LicenseTokenList struct { - metav1.TypeMeta - metav1.ListMeta - Items []LicenseToken + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []LicenseToken `json:"items"` } func (LicenseToken) NewStatus() interface{} { @@ -5035,9 +5035,9 @@ type LoftUpgradeStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type LoftUpgradeList struct { - metav1.TypeMeta - metav1.ListMeta - Items []LoftUpgrade + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []LoftUpgrade `json:"items"` } func (LoftUpgrade) NewStatus() interface{} { @@ -5154,9 +5154,9 @@ type OwnedAccessKeyStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type OwnedAccessKeyList struct { - metav1.TypeMeta - metav1.ListMeta - Items []OwnedAccessKey + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []OwnedAccessKey `json:"items"` } func (OwnedAccessKey) NewStatus() interface{} { @@ -5273,9 +5273,9 @@ type PolicyViolationStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type PolicyViolationList struct { - metav1.TypeMeta - metav1.ListMeta - Items []PolicyViolation + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []PolicyViolation `json:"items"` } func (PolicyViolation) NewStatus() interface{} { @@ -5392,81 +5392,81 @@ type ProjectStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Project + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Project `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectChartInfoList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectChartInfo + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectChartInfo `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectChartsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectCharts + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectCharts `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectClustersList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectClusters + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectClusters `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectImportSpaceList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectImportSpace + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectImportSpace `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectImportVirtualClusterList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectImportVirtualCluster + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectImportVirtualCluster `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectMembersList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectMembers + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectMembers `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectMigrateSpaceInstanceList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectMigrateSpaceInstance + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectMigrateSpaceInstance `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectMigrateVirtualClusterInstanceList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectMigrateVirtualClusterInstance + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectMigrateVirtualClusterInstance `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectTemplatesList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectTemplates + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectTemplates `json:"items"` } func (Project) NewStatus() interface{} { @@ -5583,9 +5583,9 @@ type ProjectSecretStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ProjectSecretList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ProjectSecret + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectSecret `json:"items"` } func (ProjectSecret) NewStatus() interface{} { @@ -5702,9 +5702,9 @@ type RedirectTokenStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type RedirectTokenList struct { - metav1.TypeMeta - metav1.ListMeta - Items []RedirectToken + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []RedirectToken `json:"items"` } func (RedirectToken) NewStatus() interface{} { @@ -5821,9 +5821,9 @@ type ResetAccessKeyStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ResetAccessKeyList struct { - metav1.TypeMeta - metav1.ListMeta - Items []ResetAccessKey + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ResetAccessKey `json:"items"` } func (ResetAccessKey) NewStatus() interface{} { @@ -5940,25 +5940,25 @@ type RunnerStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type RunnerList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Runner + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Runner `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type RunnerAccessKeyList struct { - metav1.TypeMeta - metav1.ListMeta - Items []RunnerAccessKey + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []RunnerAccessKey `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type RunnerConfigList struct { - metav1.TypeMeta - metav1.ListMeta - Items []RunnerConfig + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []RunnerConfig `json:"items"` } func (Runner) NewStatus() interface{} { @@ -6075,9 +6075,9 @@ type SelfStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SelfList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Self + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Self `json:"items"` } func (Self) NewStatus() interface{} { @@ -6194,9 +6194,9 @@ type SelfSubjectAccessReviewStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SelfSubjectAccessReviewList struct { - metav1.TypeMeta - metav1.ListMeta - Items []SelfSubjectAccessReview + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []SelfSubjectAccessReview `json:"items"` } func (SelfSubjectAccessReview) NewStatus() interface{} { @@ -6313,9 +6313,9 @@ type SharedSecretStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SharedSecretList struct { - metav1.TypeMeta - metav1.ListMeta - Items []SharedSecret + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []SharedSecret `json:"items"` } func (SharedSecret) NewStatus() interface{} { @@ -6432,9 +6432,9 @@ type SpaceConstraintStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SpaceConstraintList struct { - metav1.TypeMeta - metav1.ListMeta - Items []SpaceConstraint + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []SpaceConstraint `json:"items"` } func (SpaceConstraint) NewStatus() interface{} { @@ -6551,9 +6551,9 @@ type SpaceInstanceStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SpaceInstanceList struct { - metav1.TypeMeta - metav1.ListMeta - Items []SpaceInstance + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []SpaceInstance `json:"items"` } func (SpaceInstance) NewStatus() interface{} { @@ -6670,9 +6670,9 @@ type SpaceTemplateStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SpaceTemplateList struct { - metav1.TypeMeta - metav1.ListMeta - Items []SpaceTemplate + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []SpaceTemplate `json:"items"` } func (SpaceTemplate) NewStatus() interface{} { @@ -6789,9 +6789,9 @@ type SubjectAccessReviewStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type SubjectAccessReviewList struct { - metav1.TypeMeta - metav1.ListMeta - Items []SubjectAccessReview + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []SubjectAccessReview `json:"items"` } func (SubjectAccessReview) NewStatus() interface{} { @@ -6908,17 +6908,17 @@ type TaskStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TaskList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Task + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Task `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TaskLogList struct { - metav1.TypeMeta - metav1.ListMeta - Items []TaskLog + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []TaskLog `json:"items"` } func (Task) NewStatus() interface{} { @@ -7035,25 +7035,25 @@ type TeamStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TeamList struct { - metav1.TypeMeta - metav1.ListMeta - Items []Team + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Team `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TeamAccessKeysList struct { - metav1.TypeMeta - metav1.ListMeta - Items []TeamAccessKeys + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []TeamAccessKeys `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type TeamClustersList struct { - metav1.TypeMeta - metav1.ListMeta - Items []TeamClusters + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []TeamClusters `json:"items"` } func (Team) NewStatus() interface{} { @@ -7170,41 +7170,41 @@ type UserStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserList struct { - metav1.TypeMeta - metav1.ListMeta - Items []User + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []User `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserAccessKeysList struct { - metav1.TypeMeta - metav1.ListMeta - Items []UserAccessKeys + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []UserAccessKeys `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserClustersList struct { - metav1.TypeMeta - metav1.ListMeta - Items []UserClusters + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []UserClusters `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserPermissionsList struct { - metav1.TypeMeta - metav1.ListMeta - Items []UserPermissions + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []UserPermissions `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type UserProfileList struct { - metav1.TypeMeta - metav1.ListMeta - Items []UserProfile + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []UserProfile `json:"items"` } func (User) NewStatus() interface{} { @@ -7321,33 +7321,33 @@ type VirtualClusterInstanceStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstanceList struct { - metav1.TypeMeta - metav1.ListMeta - Items []VirtualClusterInstance + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []VirtualClusterInstance `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstanceKubeConfigList struct { - metav1.TypeMeta - metav1.ListMeta - Items []VirtualClusterInstanceKubeConfig + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []VirtualClusterInstanceKubeConfig `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstanceLogList struct { - metav1.TypeMeta - metav1.ListMeta - Items []VirtualClusterInstanceLog + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []VirtualClusterInstanceLog `json:"items"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterInstanceWorkloadKubeConfigList struct { - metav1.TypeMeta - metav1.ListMeta - Items []VirtualClusterInstanceWorkloadKubeConfig + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []VirtualClusterInstanceWorkloadKubeConfig `json:"items"` } func (VirtualClusterInstance) NewStatus() interface{} { @@ -7464,9 +7464,9 @@ type VirtualClusterTemplateStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type VirtualClusterTemplateList struct { - metav1.TypeMeta - metav1.ListMeta - Items []VirtualClusterTemplate + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []VirtualClusterTemplate `json:"items"` } func (VirtualClusterTemplate) NewStatus() interface{} { diff --git a/vendor/github.com/loft-sh/api/v3/pkg/apis/virtualcluster/zz_generated.api.register.go b/vendor/github.com/loft-sh/api/v3/pkg/apis/virtualcluster/zz_generated.api.register.go index 6ceea9105..52b7d61ac 100644 --- a/vendor/github.com/loft-sh/api/v3/pkg/apis/virtualcluster/zz_generated.api.register.go +++ b/vendor/github.com/loft-sh/api/v3/pkg/apis/virtualcluster/zz_generated.api.register.go @@ -75,18 +75,18 @@ func Resource(resource string) schema.GroupResource { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type HelmRelease struct { - metav1.TypeMeta - metav1.ObjectMeta - Spec HelmReleaseSpec - Status HelmReleaseStatus + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec HelmReleaseSpec `json:"spec,omitempty"` + Status HelmReleaseStatus `json:"status,omitempty"` } type HelmReleaseSpec struct { - clusterv1.HelmReleaseSpec + clusterv1.HelmReleaseSpec `json:",inline"` } type HelmReleaseStatus struct { - clusterv1.HelmReleaseStatus + clusterv1.HelmReleaseStatus `json:",inline"` } // HelmRelease Functions and Structs @@ -104,9 +104,9 @@ type HelmReleaseStatusStrategy struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type HelmReleaseList struct { - metav1.TypeMeta - metav1.ListMeta - Items []HelmRelease + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []HelmRelease `json:"items"` } func (HelmRelease) NewStatus() interface{} { diff --git a/vendor/github.com/loft-sh/api/v3/pkg/product/name.go b/vendor/github.com/loft-sh/api/v3/pkg/product/name.go index 1a5b7c11d..4031c1e55 100644 --- a/vendor/github.com/loft-sh/api/v3/pkg/product/name.go +++ b/vendor/github.com/loft-sh/api/v3/pkg/product/name.go @@ -5,30 +5,30 @@ import ( "os" "sync" - "github.com/loft-sh/admin-apis/pkg/licenseapi" + "github.com/loft-sh/admin-apis/pkg/features" "k8s.io/klog/v2" ) // Product is the global variable to be set at build time -var productName string = string(licenseapi.Loft) +var productName string = string(features.Loft) var once sync.Once func loadProductVar() { productEnv := os.Getenv("PRODUCT") - if productEnv == string(licenseapi.DevPodPro) { - productName = string(licenseapi.DevPodPro) - } else if productEnv == string(licenseapi.VClusterPro) { - productName = string(licenseapi.VClusterPro) - } else if productEnv == string(licenseapi.Loft) { - productName = string(licenseapi.Loft) + if productEnv == string(features.DevPodPro) { + productName = string(features.DevPodPro) + } else if productEnv == string(features.VClusterPro) { + productName = string(features.VClusterPro) + } else if productEnv == string(features.Loft) { + productName = string(features.Loft) } else if productEnv != "" { klog.TODO().Error(fmt.Errorf("unrecognized product %s", productEnv), "error parsing product", "product", productEnv) } } -func Name() licenseapi.ProductName { +func Name() features.ProductName { once.Do(loadProductVar) - return licenseapi.ProductName(productName) + return features.ProductName(productName) } // Name returns the name of the product @@ -36,11 +36,11 @@ func DisplayName() string { loftDisplayName := "Loft" switch Name() { - case licenseapi.DevPodPro: + case features.DevPodPro: return "DevPod Pro" - case licenseapi.VClusterPro: + case features.VClusterPro: return "vCluster.Pro" - case licenseapi.Loft: + case features.Loft: } return loftDisplayName diff --git a/vendor/github.com/loft-sh/api/v3/pkg/product/replace.go b/vendor/github.com/loft-sh/api/v3/pkg/product/replace.go index 749ec724b..a5b03ea17 100644 --- a/vendor/github.com/loft-sh/api/v3/pkg/product/replace.go +++ b/vendor/github.com/loft-sh/api/v3/pkg/product/replace.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/loft-sh/admin-apis/pkg/licenseapi" + "github.com/loft-sh/admin-apis/pkg/features" ) // Replace replaces the product name in the given usage string @@ -30,19 +30,19 @@ import ( // - The updated string with product name replaced if needed. func Replace(content string) string { switch Name() { - case licenseapi.DevPodPro: + case features.DevPodPro: content = strings.Replace(content, "loft.sh", "devpod.pro", -1) content = strings.Replace(content, "loft.host", "devpod.host", -1) content = strings.Replace(content, "loft", "devpod pro", -1) content = strings.Replace(content, "Loft", "DevPod.Pro", -1) - case licenseapi.VClusterPro: + case features.VClusterPro: content = strings.Replace(content, "loft.sh", "vcluster.pro", -1) content = strings.Replace(content, "loft.host", "vcluster.host", -1) content = strings.Replace(content, "loft", "vcluster pro", -1) content = strings.Replace(content, "Loft", "vCluster.Pro", -1) - case licenseapi.Loft: + case features.Loft: } return content @@ -73,14 +73,14 @@ func Replace(content string) string { func ReplaceWithHeader(use, content string) string { maxChar := 56 - productName := licenseapi.Loft + productName := features.Loft switch Name() { - case licenseapi.DevPodPro: + case features.DevPodPro: productName = "devpod pro" - case licenseapi.VClusterPro: + case features.VClusterPro: productName = "vcluster pro" - case licenseapi.Loft: + case features.Loft: } paddingSize := (maxChar - 2 - len(productName) - len(use)) / 2 diff --git a/vendor/github.com/loft-sh/api/v3/pkg/product/strings.go b/vendor/github.com/loft-sh/api/v3/pkg/product/strings.go index d525275b4..a20994fa5 100644 --- a/vendor/github.com/loft-sh/api/v3/pkg/product/strings.go +++ b/vendor/github.com/loft-sh/api/v3/pkg/product/strings.go @@ -1,17 +1,19 @@ package product -import "github.com/loft-sh/admin-apis/pkg/licenseapi" +import ( + "github.com/loft-sh/admin-apis/pkg/features" +) // LoginCmd returns the login command for the product func LoginCmd() string { loginCmd := "loft login" switch Name() { - case licenseapi.DevPodPro: + case features.DevPodPro: return "devpod login" - case licenseapi.VClusterPro: + case features.VClusterPro: return "vcluster login" - case licenseapi.Loft: + case features.Loft: } return loginCmd @@ -22,11 +24,11 @@ func StartCmd() string { loginCmd := "loft start" switch Name() { - case licenseapi.DevPodPro: + case features.DevPodPro: loginCmd = "devpod pro start" - case licenseapi.VClusterPro: + case features.VClusterPro: loginCmd = "vcluster pro start" - case licenseapi.Loft: + case features.Loft: } return loginCmd @@ -37,11 +39,11 @@ func Url() string { loginCmd := "loft-url" switch Name() { - case licenseapi.DevPodPro: + case features.DevPodPro: loginCmd = "devpod-pro-url" - case licenseapi.VClusterPro: + case features.VClusterPro: loginCmd = "vcluster-pro-url" - case licenseapi.Loft: + case features.Loft: } return loginCmd @@ -52,11 +54,11 @@ func ResetPassword() string { resetPassword := "loft reset password" switch Name() { - case licenseapi.DevPodPro: + case features.DevPodPro: return "devpod pro reset password" - case licenseapi.VClusterPro: + case features.VClusterPro: return "vcluster pro reset password" - case licenseapi.Loft: + case features.Loft: } return resetPassword diff --git a/vendor/github.com/loft-sh/loftctl/v3/pkg/start/success.go b/vendor/github.com/loft-sh/loftctl/v3/pkg/start/success.go index d3c61f437..8906c2fd2 100644 --- a/vendor/github.com/loft-sh/loftctl/v3/pkg/start/success.go +++ b/vendor/github.com/loft-sh/loftctl/v3/pkg/start/success.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/loft-sh/admin-apis/pkg/licenseapi" + "github.com/loft-sh/admin-apis/pkg/features" "github.com/loft-sh/api/v3/pkg/product" "github.com/loft-sh/loftctl/v3/pkg/client" "github.com/loft-sh/loftctl/v3/pkg/clihelper" @@ -208,7 +208,7 @@ func (l *LoftStarter) successRemote(ctx context.Context, host string) error { } func (l *LoftStarter) printVClusterProGettingStarted(url string) { - if product.Name() != licenseapi.VClusterPro { + if product.Name() != features.VClusterPro { return } diff --git a/vendor/modules.txt b/vendor/modules.txt index c42415799..2e47b8142 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -332,10 +332,11 @@ github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1 # github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de ## explicit github.com/liggitt/tabwriter -# github.com/loft-sh/admin-apis v0.0.0-20231102064836-7a6574be5f16 +# github.com/loft-sh/admin-apis v0.0.0-20240202092301-43d989db6f95 ## explicit; go 1.21.1 +github.com/loft-sh/admin-apis/pkg/features github.com/loft-sh/admin-apis/pkg/licenseapi -# github.com/loft-sh/agentapi/v3 v3.4.0-beta.11.0.20240123094803-669b6def4eb6 +# github.com/loft-sh/agentapi/v3 v3.4.0-beta.12.0.20240202135812-bc4ecf58f665 ## explicit; go 1.21.5 github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/v1 @@ -347,7 +348,7 @@ github.com/loft-sh/agentapi/v3/pkg/client/loft/clientset_generated/clientset/typ # github.com/loft-sh/analytics-client v0.0.0-20231127192707-f76e263f6c83 ## explicit; go 1.21 github.com/loft-sh/analytics-client/client -# github.com/loft-sh/api/v3 v3.0.0-20240123094839-7e1855cd6ad7 +# github.com/loft-sh/api/v3 v3.0.0-20240202135831-33c4357035e6 ## explicit; go 1.21.5 github.com/loft-sh/api/v3/pkg/apis/audit/v1 github.com/loft-sh/api/v3/pkg/apis/management @@ -365,13 +366,13 @@ github.com/loft-sh/api/v3/pkg/client/clientset_generated/clientset/typed/storage github.com/loft-sh/api/v3/pkg/client/clientset_generated/clientset/typed/virtualcluster/v1 github.com/loft-sh/api/v3/pkg/managerfactory github.com/loft-sh/api/v3/pkg/product -# github.com/loft-sh/apiserver v0.0.0-20240122115656-e1a690b2e2d8 +# github.com/loft-sh/apiserver v0.0.0-20240125143607-a106e2f2e0f1 ## explicit; go 1.21.5 github.com/loft-sh/apiserver/pkg/builders # github.com/loft-sh/jspolicy v0.2.2 ## explicit; go 1.16 github.com/loft-sh/jspolicy/pkg/apis/policy/v1beta1 -# github.com/loft-sh/loftctl/v3 v3.0.0-20240123132211-f09474d1f54c +# github.com/loft-sh/loftctl/v3 v3.0.0-20240202135933-6548c1e817a7 ## explicit; go 1.21.5 github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd/connect