Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Automatic Update Crossplane Types to 3895/merge" #9

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Revert "Automatic Update Crossplane Types to 3895/merge" #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apis/core/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions internal/types/generated/akuity/v1alpha1/argocdinstance_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@ 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"`
Expand All @@ -80,7 +74,6 @@ 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 {
Expand Down
10 changes: 0 additions & 10 deletions internal/types/generated/akuity/v1alpha1/cluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ type Cluster struct {

type ClusterSize string

type DirectClusterType string

//+kubebuilder:object:root=true

// ClusterList contains a list of Cluster
Expand All @@ -44,19 +42,11 @@ 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"`
Kustomization runtime.RawExtension `json:"kustomization,omitempty"`
AppReplication *bool `json:"appReplication,omitempty"`
TargetVersion string `json:"targetVersion,omitempty"`
RedisTunneling *bool `json:"redisTunneling,omitempty"`
DirectClusterSpec *DirectClusterSpec `json:"directClusterSpec,omitempty"`
}
76 changes: 0 additions & 76 deletions internal/types/generated/akuity/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 4 additions & 17 deletions internal/types/generated/crossplane/v1alpha1/argocdinstance_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ 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"`
Expand All @@ -30,10 +25,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
Expand All @@ -42,13 +37,6 @@ 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"`
Expand All @@ -66,7 +54,6 @@ 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
Expand Down
28 changes: 6 additions & 22 deletions internal/types/generated/crossplane/v1alpha1/cluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,24 @@ 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"`
NamespaceScoped bool `json:"namespaceScoped,omitempty"`
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"`
DirectClusterSpec *DirectClusterSpec `json:"directClusterSpec,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"`
}
5 changes: 0 additions & 5 deletions internal/types/generated/crossplane/v1alpha1/configmanagementplugin_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ 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"`
Expand Down
Loading
Loading