From 5dec28d96ff73d871f1a0e65f61f5efa1654cc2e Mon Sep 17 00:00:00 2001 From: Akuity Bot Date: Fri, 26 Jan 2024 06:50:16 +0000 Subject: [PATCH] Automatic Update Crossplane Types to 3895/merge --- apis/core/v1alpha1/zz_generated.deepcopy.go | 2 +- .../akuity/v1alpha1/argocdinstance_types.go | 7 ++ .../akuity/v1alpha1/cluster_types.go | 10 +++ .../akuity/v1alpha1/zz_generated.deepcopy.go | 76 +++++++++++++++++++ .../v1alpha1/argocdinstance_types.go | 21 ++++- .../crossplane/v1alpha1/cluster_types.go | 28 +++++-- .../v1alpha1/configmanagementplugin_types.go | 5 ++ .../core.akuity.crossplane.io_clusters.yaml | 11 +++ .../core.akuity.crossplane.io_instances.yaml | 34 +++++++++ 9 files changed, 183 insertions(+), 11 deletions(-) diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go index 82e6b79..9bd0ba0 100644 --- a/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -172,7 +172,7 @@ func (in *ClusterObservationStatus) DeepCopy() *ClusterObservationStatus { func (in *ClusterParameters) DeepCopyInto(out *ClusterParameters) { *out = *in out.InstanceRef = in.InstanceRef - out.ClusterSpec = in.ClusterSpec + in.ClusterSpec.DeepCopyInto(&out.ClusterSpec) if in.Annotations != nil { in, out := &in.Annotations, &out.Annotations *out = make(map[string]string, len(*in)) diff --git a/internal/types/generated/akuity/v1alpha1/argocdinstance_types.go b/internal/types/generated/akuity/v1alpha1/argocdinstance_types.go index 9d5ffaf..a875643 100644 --- a/internal/types/generated/akuity/v1alpha1/argocdinstance_types.go +++ b/internal/types/generated/akuity/v1alpha1/argocdinstance_types.go @@ -58,6 +58,12 @@ type AppsetPolicy struct { OverridePolicy bool `json:"overridePolicy,omitempty"` } +type AgentPermissionsRule struct { + ApiGroups []string `json:"apiGroups,omitempty"` + Resources []string `json:"resources,omitempty"` + Verbs []string `json:"verbs,omitempty"` +} + type InstanceSpec struct { IpAllowList []*IPAllowListEntry `json:"ipAllowList,omitempty"` Subdomain string `json:"subdomain,omitempty"` @@ -74,6 +80,7 @@ type InstanceSpec struct { AssistantExtensionEnabled bool `json:"assistantExtensionEnabled,omitempty"` AppsetPolicy *AppsetPolicy `json:"appsetPolicy,omitempty"` HostAliases []*HostAliases `json:"hostAliases,omitempty"` + AgentPermissionsRules []*AgentPermissionsRule `json:"agentPermissionsRules,omitempty"` } type ManagedCluster struct { diff --git a/internal/types/generated/akuity/v1alpha1/cluster_types.go b/internal/types/generated/akuity/v1alpha1/cluster_types.go index 84a1b42..cd95838 100644 --- a/internal/types/generated/akuity/v1alpha1/cluster_types.go +++ b/internal/types/generated/akuity/v1alpha1/cluster_types.go @@ -23,6 +23,8 @@ type Cluster struct { type ClusterSize string +type DirectClusterType string + //+kubebuilder:object:root=true // ClusterList contains a list of Cluster @@ -42,6 +44,13 @@ type ClusterSpec struct { Data ClusterData `json:"data,omitempty"` } +type DirectClusterSpec struct { + ClusterType DirectClusterType `json:"clusterType,omitempty"` + KargoInstanceId *string `json:"kargoInstanceId,omitempty"` + Server *string `json:"server,omitempty"` + Token *string `json:"token,omitempty"` +} + type ClusterData struct { Size ClusterSize `json:"size,omitempty"` AutoUpgradeDisabled *bool `json:"autoUpgradeDisabled,omitempty"` @@ -49,4 +58,5 @@ type ClusterData struct { AppReplication *bool `json:"appReplication,omitempty"` TargetVersion string `json:"targetVersion,omitempty"` RedisTunneling *bool `json:"redisTunneling,omitempty"` + DirectClusterSpec *DirectClusterSpec `json:"directClusterSpec,omitempty"` } diff --git a/internal/types/generated/akuity/v1alpha1/zz_generated.deepcopy.go b/internal/types/generated/akuity/v1alpha1/zz_generated.deepcopy.go index 1caf47d..7590022 100644 --- a/internal/types/generated/akuity/v1alpha1/zz_generated.deepcopy.go +++ b/internal/types/generated/akuity/v1alpha1/zz_generated.deepcopy.go @@ -9,6 +9,36 @@ import ( "k8s.io/apimachinery/pkg/runtime" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AgentPermissionsRule) DeepCopyInto(out *AgentPermissionsRule) { + *out = *in + if in.ApiGroups != nil { + in, out := &in.ApiGroups, &out.ApiGroups + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Resources != nil { + in, out := &in.Resources, &out.Resources + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Verbs != nil { + in, out := &in.Verbs, &out.Verbs + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AgentPermissionsRule. +func (in *AgentPermissionsRule) DeepCopy() *AgentPermissionsRule { + if in == nil { + return nil + } + out := new(AgentPermissionsRule) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AppSetDelegate) DeepCopyInto(out *AppSetDelegate) { *out = *in @@ -194,6 +224,11 @@ func (in *ClusterData) DeepCopyInto(out *ClusterData) { *out = new(bool) **out = **in } + if in.DirectClusterSpec != nil { + in, out := &in.DirectClusterSpec, &out.DirectClusterSpec + *out = new(DirectClusterSpec) + (*in).DeepCopyInto(*out) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterData. @@ -254,6 +289,36 @@ func (in *ClusterSpec) DeepCopy() *ClusterSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DirectClusterSpec) DeepCopyInto(out *DirectClusterSpec) { + *out = *in + if in.KargoInstanceId != nil { + in, out := &in.KargoInstanceId, &out.KargoInstanceId + *out = new(string) + **out = **in + } + if in.Server != nil { + in, out := &in.Server, &out.Server + *out = new(string) + **out = **in + } + if in.Token != nil { + in, out := &in.Token, &out.Token + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DirectClusterSpec. +func (in *DirectClusterSpec) DeepCopy() *DirectClusterSpec { + if in == nil { + return nil + } + out := new(DirectClusterSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HostAliases) DeepCopyInto(out *HostAliases) { *out = *in @@ -370,6 +435,17 @@ func (in *InstanceSpec) DeepCopyInto(out *InstanceSpec) { } } } + if in.AgentPermissionsRules != nil { + in, out := &in.AgentPermissionsRules, &out.AgentPermissionsRules + *out = make([]*AgentPermissionsRule, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(AgentPermissionsRule) + (*in).DeepCopyInto(*out) + } + } + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InstanceSpec. diff --git a/internal/types/generated/crossplane/v1alpha1/argocdinstance_types.go b/internal/types/generated/crossplane/v1alpha1/argocdinstance_types.go index 64c5f08..0a0935f 100644 --- a/internal/types/generated/crossplane/v1alpha1/argocdinstance_types.go +++ b/internal/types/generated/crossplane/v1alpha1/argocdinstance_types.go @@ -10,6 +10,11 @@ type ArgoCD struct { Spec ArgoCDSpec `json:"spec,omitempty"` } +// +kubebuilder:object:generate=true +type ArgoCDList struct { + Items []ArgoCD `json:"items"` +} + // +kubebuilder:object:generate=true type ArgoCDSpec struct { Description string `json:"description,omitempty"` @@ -25,10 +30,10 @@ type ArgoCDExtensionInstallEntry struct { // +kubebuilder:object:generate=true type ClusterCustomization struct { - AutoUpgradeDisabled bool `json:"autoUpgradeDisabled,omitempty"` - Kustomization string `json:"kustomization,omitempty"` - AppReplication bool `json:"appReplication,omitempty"` - RedisTunneling bool `json:"redisTunneling,omitempty"` + AutoUpgradeDisabled bool `json:"autoUpgradeDisabled,omitempty"` + Kustomization string `json:"kustomization,omitempty"` + AppReplication bool `json:"appReplication,omitempty"` + RedisTunneling bool `json:"redisTunneling,omitempty"` } // +kubebuilder:object:generate=true @@ -37,6 +42,13 @@ type AppsetPolicy struct { OverridePolicy bool `json:"overridePolicy,omitempty"` } +// +kubebuilder:object:generate=true +type AgentPermissionsRule struct { + ApiGroups []string `json:"apiGroups,omitempty"` + Resources []string `json:"resources,omitempty"` + Verbs []string `json:"verbs,omitempty"` +} + // +kubebuilder:object:generate=true type InstanceSpec struct { IpAllowList []*IPAllowListEntry `json:"ipAllowList,omitempty"` @@ -54,6 +66,7 @@ type InstanceSpec struct { AssistantExtensionEnabled bool `json:"assistantExtensionEnabled,omitempty"` AppsetPolicy *AppsetPolicy `json:"appsetPolicy,omitempty"` HostAliases []*HostAliases `json:"hostAliases,omitempty"` + AgentPermissionsRules []*AgentPermissionsRule `json:"agentPermissionsRules,omitempty"` } // +kubebuilder:object:generate=true diff --git a/internal/types/generated/crossplane/v1alpha1/cluster_types.go b/internal/types/generated/crossplane/v1alpha1/cluster_types.go index 3b83782..376ba76 100644 --- a/internal/types/generated/crossplane/v1alpha1/cluster_types.go +++ b/internal/types/generated/crossplane/v1alpha1/cluster_types.go @@ -7,11 +7,18 @@ package v1alpha1 type ClusterSize string +type DirectClusterType string + // +kubebuilder:object:generate=true type Cluster struct { Spec ClusterSpec `json:"spec,omitempty"` } +// +kubebuilder:object:generate=true +type ClusterList struct { + Items []Cluster `json:"items"` +} + // +kubebuilder:object:generate=true type ClusterSpec struct { Description string `json:"description,omitempty"` @@ -19,12 +26,21 @@ type ClusterSpec struct { Data ClusterData `json:"data,omitempty"` } +// +kubebuilder:object:generate=true +type DirectClusterSpec struct { + ClusterType DirectClusterType `json:"clusterType,omitempty"` + KargoInstanceId *string `json:"kargoInstanceId,omitempty"` + Server *string `json:"server,omitempty"` + Token *string `json:"token,omitempty"` +} + // +kubebuilder:object:generate=true type ClusterData struct { - Size ClusterSize `json:"size,omitempty"` - AutoUpgradeDisabled bool `json:"autoUpgradeDisabled,omitempty"` - Kustomization string `json:"kustomization,omitempty"` - AppReplication bool `json:"appReplication,omitempty"` - TargetVersion string `json:"targetVersion,omitempty"` - RedisTunneling bool `json:"redisTunneling,omitempty"` + Size ClusterSize `json:"size,omitempty"` + AutoUpgradeDisabled bool `json:"autoUpgradeDisabled,omitempty"` + Kustomization string `json:"kustomization,omitempty"` + AppReplication bool `json:"appReplication,omitempty"` + TargetVersion string `json:"targetVersion,omitempty"` + RedisTunneling bool `json:"redisTunneling,omitempty"` + DirectClusterSpec *DirectClusterSpec `json:"directClusterSpec,omitempty"` } diff --git a/internal/types/generated/crossplane/v1alpha1/configmanagementplugin_types.go b/internal/types/generated/crossplane/v1alpha1/configmanagementplugin_types.go index 7cd67b9..62ab046 100644 --- a/internal/types/generated/crossplane/v1alpha1/configmanagementplugin_types.go +++ b/internal/types/generated/crossplane/v1alpha1/configmanagementplugin_types.go @@ -12,6 +12,11 @@ type ConfigManagementPlugin struct { Spec PluginSpec `json:"spec,omitempty"` } +// +kubebuilder:object:generate=true +type ConfigManagementPluginList struct { + Items []ConfigManagementPlugin `json:"items"` +} + // +kubebuilder:object:generate=true type PluginSpec struct { Version string `json:"version,omitempty"` diff --git a/package/crds/core.akuity.crossplane.io_clusters.yaml b/package/crds/core.akuity.crossplane.io_clusters.yaml index e839990..b516ce6 100644 --- a/package/crds/core.akuity.crossplane.io_clusters.yaml +++ b/package/crds/core.akuity.crossplane.io_clusters.yaml @@ -82,6 +82,17 @@ spec: type: boolean autoUpgradeDisabled: type: boolean + directClusterSpec: + properties: + clusterType: + type: string + kargoInstanceId: + type: string + server: + type: string + token: + type: string + type: object kustomization: type: string redisTunneling: diff --git a/package/crds/core.akuity.crossplane.io_instances.yaml b/package/crds/core.akuity.crossplane.io_instances.yaml index 846aef8..9729c4c 100644 --- a/package/crds/core.akuity.crossplane.io_instances.yaml +++ b/package/crds/core.akuity.crossplane.io_instances.yaml @@ -76,6 +76,23 @@ spec: type: string instanceSpec: properties: + agentPermissionsRules: + items: + properties: + apiGroups: + items: + type: string + type: array + resources: + items: + type: string + type: array + verbs: + items: + type: string + type: array + type: object + type: array appSetDelegate: properties: managedCluster: @@ -500,6 +517,23 @@ spec: type: string instanceSpec: properties: + agentPermissionsRules: + items: + properties: + apiGroups: + items: + type: string + type: array + resources: + items: + type: string + type: array + verbs: + items: + type: string + type: array + type: object + type: array appSetDelegate: properties: managedCluster: