Skip to content

Commit c2b45cb

Browse files
akuitybotakuitybot
committed
Automatic Update Terraform Types to v0.20.1
1 parent b097204 commit c2b45cb

File tree

3 files changed

+105
-42
lines changed

3 files changed

+105
-42
lines changed

‎akp/apis/v1alpha1/argocd.go

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,32 @@ type CrossplaneExtension struct {
5555
Resources []*CrossplaneExtensionResource `json:"resources,omitempty"`
5656
}
5757

58+
type KubeVisionArgoExtension struct {
59+
Enabled *bool `json:"enabled,omitempty"`
60+
AllowedUsernames []string `json:"allowedUsernames,omitempty"`
61+
AllowedGroups []string `json:"allowedGroups,omitempty"`
62+
}
63+
64+
type KubeVisionConfig struct {
65+
CveScanConfig *CveScanConfig `json:"cveScanConfig,omitempty"`
66+
}
67+
68+
type AppInAnyNamespaceConfig struct {
69+
Enabled *bool `json:"enabled,omitempty"`
70+
}
71+
72+
type CustomDeprecatedAPI struct {
73+
ApiVersion string `json:"apiVersion,omitempty"`
74+
NewApiVersion string `json:"newApiVersion,omitempty"`
75+
DeprecatedInKubernetesVersion string `json:"deprecatedInKubernetesVersion,omitempty"`
76+
UnavailableInKubernetesVersion string `json:"unavailableInKubernetesVersion,omitempty"`
77+
}
78+
79+
type CveScanConfig struct {
80+
ScanEnabled *bool `json:"scanEnabled,omitempty"`
81+
RescanInterval string `json:"rescanInterval,omitempty"`
82+
}
83+
5884
type InstanceSpec struct {
5985
IpAllowList []*IPAllowListEntry `json:"ipAllowList,omitempty"`
6086
Subdomain string `json:"subdomain,omitempty"`
@@ -73,8 +99,14 @@ type InstanceSpec struct {
7399
AppsetPolicy *AppsetPolicy `json:"appsetPolicy,omitempty"`
74100
HostAliases []*HostAliases `json:"hostAliases,omitempty"`
75101
AgentPermissionsRules []*AgentPermissionsRule `json:"agentPermissionsRules,omitempty"`
76-
Fqdn *string `json:"fqdn,omitempty"`
102+
Fqdn string `json:"fqdn,omitempty"`
77103
MultiClusterK8SDashboardEnabled *bool `json:"multiClusterK8sDashboardEnabled,omitempty"`
104+
KubeVisionArgoExtension *KubeVisionArgoExtension `json:"kubeVisionArgoExtension,omitempty"`
105+
ImageUpdaterVersion string `json:"imageUpdaterVersion,omitempty"`
106+
CustomDeprecatedApis []*CustomDeprecatedAPI `json:"customDeprecatedApis,omitempty"`
107+
KubeVisionConfig *KubeVisionConfig `json:"kubeVisionConfig,omitempty"`
108+
AppInAnyNamespaceConfig *AppInAnyNamespaceConfig `json:"appInAnyNamespaceConfig,omitempty"`
109+
Basepath string `json:"basepath,omitempty"`
78110
}
79111

80112
type ManagedCluster struct {

‎akp/types/argocd.go

Lines changed: 51 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,58 @@ type CrossplaneExtension struct {
5050
Resources []*CrossplaneExtensionResource `tfsdk:"resources"`
5151
}
5252

53+
type KubeVisionArgoExtension struct {
54+
Enabled types.Bool `tfsdk:"enabled"`
55+
AllowedUsernames []types.String `tfsdk:"allowed_usernames"`
56+
AllowedGroups []types.String `tfsdk:"allowed_groups"`
57+
}
58+
59+
type KubeVisionConfig struct {
60+
CveScanConfig *CveScanConfig `tfsdk:"cve_scan_config"`
61+
}
62+
63+
type AppInAnyNamespaceConfig struct {
64+
Enabled types.Bool `tfsdk:"enabled"`
65+
}
66+
67+
type CustomDeprecatedAPI struct {
68+
ApiVersion types.String `tfsdk:"api_version"`
69+
NewApiVersion types.String `tfsdk:"new_api_version"`
70+
DeprecatedInKubernetesVersion types.String `tfsdk:"deprecated_in_kubernetes_version"`
71+
UnavailableInKubernetesVersion types.String `tfsdk:"unavailable_in_kubernetes_version"`
72+
}
73+
74+
type CveScanConfig struct {
75+
ScanEnabled types.Bool `tfsdk:"scan_enabled"`
76+
RescanInterval types.String `tfsdk:"rescan_interval"`
77+
}
78+
5379
type InstanceSpec struct {
54-
IpAllowList []*IPAllowListEntry `tfsdk:"ip_allow_list"`
55-
Subdomain types.String `tfsdk:"subdomain"`
56-
DeclarativeManagementEnabled types.Bool `tfsdk:"declarative_management_enabled"`
57-
Extensions types.List `tfsdk:"extensions"`
58-
ClusterCustomizationDefaults types.Object `tfsdk:"cluster_customization_defaults"`
59-
ImageUpdaterEnabled types.Bool `tfsdk:"image_updater_enabled"`
60-
BackendIpAllowListEnabled types.Bool `tfsdk:"backend_ip_allow_list_enabled"`
61-
RepoServerDelegate *RepoServerDelegate `tfsdk:"repo_server_delegate"`
62-
AuditExtensionEnabled types.Bool `tfsdk:"audit_extension_enabled"`
63-
SyncHistoryExtensionEnabled types.Bool `tfsdk:"sync_history_extension_enabled"`
64-
CrossplaneExtension *CrossplaneExtension `tfsdk:"crossplane_extension"`
65-
ImageUpdaterDelegate *ImageUpdaterDelegate `tfsdk:"image_updater_delegate"`
66-
AppSetDelegate *AppSetDelegate `tfsdk:"app_set_delegate"`
67-
AssistantExtensionEnabled types.Bool `tfsdk:"assistant_extension_enabled"`
68-
AppsetPolicy types.Object `tfsdk:"appset_policy"`
69-
HostAliases []*HostAliases `tfsdk:"host_aliases"`
70-
AgentPermissionsRules []*AgentPermissionsRule `tfsdk:"agent_permissions_rules"`
71-
Fqdn types.String `tfsdk:"fqdn"`
72-
MultiClusterK8SDashboardEnabled types.Bool `tfsdk:"multi_cluster_k8s_dashboard_enabled"`
80+
IpAllowList []*IPAllowListEntry `tfsdk:"ip_allow_list"`
81+
Subdomain types.String `tfsdk:"subdomain"`
82+
DeclarativeManagementEnabled types.Bool `tfsdk:"declarative_management_enabled"`
83+
Extensions types.List `tfsdk:"extensions"`
84+
ClusterCustomizationDefaults types.Object `tfsdk:"cluster_customization_defaults"`
85+
ImageUpdaterEnabled types.Bool `tfsdk:"image_updater_enabled"`
86+
BackendIpAllowListEnabled types.Bool `tfsdk:"backend_ip_allow_list_enabled"`
87+
RepoServerDelegate *RepoServerDelegate `tfsdk:"repo_server_delegate"`
88+
AuditExtensionEnabled types.Bool `tfsdk:"audit_extension_enabled"`
89+
SyncHistoryExtensionEnabled types.Bool `tfsdk:"sync_history_extension_enabled"`
90+
CrossplaneExtension *CrossplaneExtension `tfsdk:"crossplane_extension"`
91+
ImageUpdaterDelegate *ImageUpdaterDelegate `tfsdk:"image_updater_delegate"`
92+
AppSetDelegate *AppSetDelegate `tfsdk:"app_set_delegate"`
93+
AssistantExtensionEnabled types.Bool `tfsdk:"assistant_extension_enabled"`
94+
AppsetPolicy types.Object `tfsdk:"appset_policy"`
95+
HostAliases []*HostAliases `tfsdk:"host_aliases"`
96+
AgentPermissionsRules []*AgentPermissionsRule `tfsdk:"agent_permissions_rules"`
97+
Fqdn types.String `tfsdk:"fqdn"`
98+
MultiClusterK8SDashboardEnabled types.Bool `tfsdk:"multi_cluster_k8s_dashboard_enabled"`
99+
KubeVisionArgoExtension *KubeVisionArgoExtension `tfsdk:"kube_vision_argo_extension"`
100+
ImageUpdaterVersion types.String `tfsdk:"image_updater_version"`
101+
CustomDeprecatedApis []*CustomDeprecatedAPI `tfsdk:"custom_deprecated_apis"`
102+
KubeVisionConfig *KubeVisionConfig `tfsdk:"kube_vision_config"`
103+
AppInAnyNamespaceConfig *AppInAnyNamespaceConfig `tfsdk:"app_in_any_namespace_config"`
104+
Basepath types.String `tfsdk:"basepath"`
73105
}
74106

75107
type ManagedCluster struct {

‎akp/types/cluster.go

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package types
77

88
import (
99
"github.com/hashicorp/terraform-plugin-framework/types"
10-
"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
1110
)
1211

1312
type Cluster struct {
@@ -28,15 +27,31 @@ type Clusters struct {
2827
Clusters []Cluster `tfsdk:"clusters"`
2928
}
3029

30+
type CustomAgentSizeConfig struct {
31+
ApplicationController *AppControllerCustomAgentSizeConfig `tfsdk:"application_controller"`
32+
RepoServer *RepoServerCustomAgentSizeConfig `tfsdk:"repo_server"`
33+
}
34+
35+
type AppControllerCustomAgentSizeConfig struct {
36+
Memory types.String `tfsdk:"memory"`
37+
Cpu types.String `tfsdk:"cpu"`
38+
}
39+
40+
type RepoServerCustomAgentSizeConfig struct {
41+
Memory types.String `tfsdk:"memory"`
42+
Cpu types.String `tfsdk:"cpu"`
43+
Replicas types.Int64 `tfsdk:"replicas"`
44+
}
45+
3146
type ClusterSpec struct {
3247
Description types.String `tfsdk:"description"`
3348
NamespaceScoped types.Bool `tfsdk:"namespace_scoped"`
3449
Data ClusterData `tfsdk:"data"`
3550
}
3651

3752
type Resources struct {
38-
Memory types.String `tfsdk:"memory"`
39-
Cpu types.String `tfsdk:"cpu"`
53+
Mem types.String `tfsdk:"mem"`
54+
Cpu types.String `tfsdk:"cpu"`
4055
}
4156

4257
type ManagedClusterConfig struct {
@@ -57,24 +72,8 @@ type AppControllerAutoScalingConfig struct {
5772
type RepoServerAutoScalingConfig struct {
5873
ResourceMinimum *Resources `tfsdk:"resource_minimum"`
5974
ResourceMaximum *Resources `tfsdk:"resource_maximum"`
60-
ReplicasMaximum types.Int64 `tfsdk:"replicas_maximum"`
61-
ReplicasMinimum types.Int64 `tfsdk:"replicas_minimum"`
62-
}
63-
64-
type CustomAgentSizeConfig struct {
65-
ApplicationController *AppControllerCustomAgentSizeConfig `tfsdk:"application_controller"`
66-
RepoServer *RepoServerCustomAgentSizeConfig `tfsdk:"repo_server"`
67-
}
68-
69-
type AppControllerCustomAgentSizeConfig struct {
70-
Memory types.String `tfsdk:"memory"`
71-
Cpu types.String `tfsdk:"cpu"`
72-
}
73-
74-
type RepoServerCustomAgentSizeConfig struct {
75-
Memory types.String `tfsdk:"memory"`
76-
Cpu types.String `tfsdk:"cpu"`
77-
Replicas types.Int64 `tfsdk:"replicas"`
75+
ReplicaMaximum types.Int64 `tfsdk:"replica_maximum"`
76+
ReplicaMinimum types.Int64 `tfsdk:"replica_minimum"`
7877
}
7978

8079
type ClusterData struct {
@@ -88,6 +87,6 @@ type ClusterData struct {
8887
EksAddonEnabled types.Bool `tfsdk:"eks_addon_enabled"`
8988
ManagedClusterConfig *ManagedClusterConfig `tfsdk:"managed_cluster_config"`
9089
MultiClusterK8SDashboardEnabled types.Bool `tfsdk:"multi_cluster_k8s_dashboard_enabled"`
91-
AutoscalerConfig basetypes.ObjectValue `tfsdk:"auto_agent_size_config"`
9290
CustomAgentSizeConfig *CustomAgentSizeConfig `tfsdk:"custom_agent_size_config"`
91+
AutoscalerConfig basetypes.ObjectValue `tfsdk:"autoscaler_config"`
9392
}

0 commit comments

Comments
 (0)