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

Automatic Update Terraform Types to to v0.19.1 #247

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Automatic Update Terraform Types to to v0.19.1 #247

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
28 changes: 27 additions & 1 deletion akp/apis/v1alpha1/argocd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,28 @@ type CrossplaneExtension struct {
Resources []*CrossplaneExtensionResource `json:"resources,omitempty"`
}

type KubeVisionArgoExtension struct {
Enabled *bool `json:"enabled,omitempty"`
AllowedUsernames []string `json:"allowedUsernames,omitempty"`
AllowedGroups []string `json:"allowedGroups,omitempty"`
}

type KubeVisionConfig struct {
CveScanConfig *CveScanConfig `json:"cveScanConfig,omitempty"`
}

type CustomDeprecatedAPI struct {
ApiVersion string `json:"apiVersion,omitempty"`
NewApiVersion string `json:"newApiVersion,omitempty"`
DeprecatedInKubernetesVersion string `json:"deprecatedInKubernetesVersion,omitempty"`
UnavailableInKubernetesVersion string `json:"unavailableInKubernetesVersion,omitempty"`
}

type CveScanConfig struct {
ScanEnabled *bool `json:"scanEnabled,omitempty"`
RescanInterval string `json:"rescanInterval,omitempty"`
}

type InstanceSpec struct {
IpAllowList []*IPAllowListEntry `json:"ipAllowList,omitempty"`
Subdomain string `json:"subdomain,omitempty"`
Expand All @@ -73,8 +95,12 @@ type InstanceSpec struct {
AppsetPolicy *AppsetPolicy `json:"appsetPolicy,omitempty"`
HostAliases []*HostAliases `json:"hostAliases,omitempty"`
AgentPermissionsRules []*AgentPermissionsRule `json:"agentPermissionsRules,omitempty"`
Fqdn *string `json:"fqdn,omitempty"`
Fqdn string `json:"fqdn,omitempty"`
MultiClusterK8SDashboardEnabled *bool `json:"multiClusterK8sDashboardEnabled,omitempty"`
KubeVisionArgoExtension *KubeVisionArgoExtension `json:"kubeVisionArgoExtension,omitempty"`
ImageUpdaterVersion string `json:"imageUpdaterVersion,omitempty"`
CustomDeprecatedApis []*CustomDeprecatedAPI `json:"customDeprecatedApis,omitempty"`
KubeVisionConfig *KubeVisionConfig `json:"kubeVisionConfig,omitempty"`
}

type ManagedCluster struct {
Expand Down
25 changes: 24 additions & 1 deletion akp/apis/v1alpha1/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,33 @@ type ClusterSpec struct {
Data ClusterData `json:"data,omitempty"`
}

type Resources struct {
Mem string `json:"mem,omitempty"`
Cpu string `json:"cpu,omitempty"`
}

type ManagedClusterConfig struct {
SecretName string `json:"secretName,omitempty"`
SecretKey string `json:"secretKey,omitempty"`
}

type AutoScalerConfig struct {
ApplicationController *AppControllerAutoScalingConfig `json:"applicationController,omitempty"`
RepoServer *RepoServerAutoScalingConfig `json:"repoServer,omitempty"`
}

type AppControllerAutoScalingConfig struct {
ResourceMinimum *Resources `json:"resourceMinimum,omitempty"`
ResourceMaximum *Resources `json:"resourceMaximum,omitempty"`
}

type RepoServerAutoScalingConfig struct {
ResourceMinimum *Resources `json:"resourceMinimum,omitempty"`
ResourceMaximum *Resources `json:"resourceMaximum,omitempty"`
ReplicaMaximum int32 `json:"replicaMaximum,omitempty"`
ReplicaMinimum int32 `json:"replicaMinimum,omitempty"`
}

type ClusterData struct {
Size ClusterSize `json:"size,omitempty"`
AutoUpgradeDisabled *bool `json:"autoUpgradeDisabled,omitempty"`
Expand All @@ -42,5 +64,6 @@ type ClusterData struct {
EksAddonEnabled *bool `json:"eksAddonEnabled,omitempty"`
ManagedClusterConfig *ManagedClusterConfig `json:"managedClusterConfig,omitempty"`

MultiClusterK8SDashboardEnabled *bool `json:"multiClusterK8sDashboardEnabled,omitempty"`
MultiClusterK8SDashboardEnabled *bool `json:"multiClusterK8sDashboardEnabled,omitempty"`
AutoscalerConfig *AutoScalerConfig `json:"autoscalerConfig,omitempty"`
}
26 changes: 26 additions & 0 deletions akp/types/argocd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,28 @@ type CrossplaneExtension struct {
Resources []*CrossplaneExtensionResource `tfsdk:"resources"`
}

type KubeVisionArgoExtension struct {
Enabled types.Bool `tfsdk:"enabled"`
AllowedUsernames []types.String `tfsdk:"allowed_usernames"`
AllowedGroups []types.String `tfsdk:"allowed_groups"`
}

type KubeVisionConfig struct {
CveScanConfig *CveScanConfig `tfsdk:"cve_scan_config"`
}

type CustomDeprecatedAPI struct {
ApiVersion types.String `tfsdk:"api_version"`
NewApiVersion types.String `tfsdk:"new_api_version"`
DeprecatedInKubernetesVersion types.String `tfsdk:"deprecated_in_kubernetes_version"`
UnavailableInKubernetesVersion types.String `tfsdk:"unavailable_in_kubernetes_version"`
}

type CveScanConfig struct {
ScanEnabled types.Bool `tfsdk:"scan_enabled"`
RescanInterval types.String `tfsdk:"rescan_interval"`
}

type InstanceSpec struct {
IpAllowList []*IPAllowListEntry `tfsdk:"ip_allow_list"`
Subdomain types.String `tfsdk:"subdomain"`
Expand All @@ -70,6 +92,10 @@ type InstanceSpec struct {
AgentPermissionsRules []*AgentPermissionsRule `tfsdk:"agent_permissions_rules"`
Fqdn types.String `tfsdk:"fqdn"`
MultiClusterK8SDashboardEnabled types.Bool `tfsdk:"multi_cluster_k8s_dashboard_enabled"`
KubeVisionArgoExtension *KubeVisionArgoExtension `tfsdk:"kube_vision_argo_extension"`
ImageUpdaterVersion types.String `tfsdk:"image_updater_version"`
CustomDeprecatedApis []*CustomDeprecatedAPI `tfsdk:"custom_deprecated_apis"`
KubeVisionConfig *KubeVisionConfig `tfsdk:"kube_vision_config"`
}

type ManagedCluster struct {
Expand Down
23 changes: 23 additions & 0 deletions akp/types/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,33 @@ type ClusterSpec struct {
Data ClusterData `tfsdk:"data"`
}

type Resources struct {
Mem types.String `tfsdk:"mem"`
Cpu types.String `tfsdk:"cpu"`
}

type ManagedClusterConfig struct {
SecretName types.String `tfsdk:"secret_name"`
SecretKey types.String `tfsdk:"secret_key"`
}

type AutoScalerConfig struct {
ApplicationController *AppControllerAutoScalingConfig `tfsdk:"application_controller"`
RepoServer *RepoServerAutoScalingConfig `tfsdk:"repo_server"`
}

type AppControllerAutoScalingConfig struct {
ResourceMinimum *Resources `tfsdk:"resource_minimum"`
ResourceMaximum *Resources `tfsdk:"resource_maximum"`
}

type RepoServerAutoScalingConfig struct {
ResourceMinimum *Resources `tfsdk:"resource_minimum"`
ResourceMaximum *Resources `tfsdk:"resource_maximum"`
ReplicaMaximum types.Int64 `tfsdk:"replica_maximum"`
ReplicaMinimum types.Int64 `tfsdk:"replica_minimum"`
}

type ClusterData struct {
Size types.String `tfsdk:"size"`
AutoUpgradeDisabled types.Bool `tfsdk:"auto_upgrade_disabled"`
Expand All @@ -49,4 +71,5 @@ type ClusterData struct {
EksAddonEnabled types.Bool `tfsdk:"eks_addon_enabled"`
ManagedClusterConfig *ManagedClusterConfig `tfsdk:"managed_cluster_config"`
MultiClusterK8SDashboardEnabled types.Bool `tfsdk:"multi_cluster_k8s_dashboard_enabled"`
AutoscalerConfig *AutoScalerConfig `tfsdk:"autoscaler_config"`
}
Loading