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

azurerm_kubernetes_cluster - maintenance_window_* added #21760

Merged
merged 26 commits into from
Jun 28, 2023
Merged

azurerm_kubernetes_cluster - maintenance_window_* added #21760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5dbf73a
`azurerm_kubernetes_cluster` - `maintenance_window_*` added
May 11, 2023
72b8c70
Remodeling
May 11, 2023
d4800e3
Fix RelativeMonthly frequency
May 11, 2023
c566541
Some extra validation
May 11, 2023
8fae619
make terrafmt
May 12, 2023
1022e0a
Update internal/services/containers/kubernetes_cluster_resource.go
aristosvo May 12, 2023
e963b3e
Update internal/services/containers/kubernetes_cluster_resource.go
aristosvo May 12, 2023
642b62e
Duration as int
May 12, 2023
41f51ea
Duration as int 2
May 12, 2023
06d1f10
Prevent duration == 0
May 12, 2023
35ba0f7
Make duration required
May 12, 2023
99d4481
Fix
May 12, 2023
74c9bf3
Make start_date computed
May 12, 2023
f984ee4
fix
May 12, 2023
7a7e138
Fixx
May 12, 2023
61faa7f
Merge maps..
May 12, 2023
50d103d
Complete tests
May 12, 2023
8c6fe4e
Format start/end
May 12, 2023
682f94b
All dates to RFC3339
May 12, 2023
a76e571
Test fixes
May 12, 2023
e1189a8
Fix update test
May 12, 2023
205726b
}}}}
May 12, 2023
377371a
Improve clarity
May 25, 2023
2ef2f75
Fix comments
aristosvo Jun 23, 2023
702c1fe
Add docs
aristosvo Jun 23, 2023
25e4631
Spelling fix Saterday
aristosvo Jun 23, 2023
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
297 changes: 287 additions & 10 deletions internal/services/containers/kubernetes_cluster_other_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,43 @@ func TestAccKubernetesCluster_upgradeChannel(t *testing.T) {
})
}

func TestAccKubernetesCluster_basicMaintenanceConfig(t *testing.T) {
func TestAccKubernetesCluster_basicMaintenanceConfigAutoUpgrade(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basicMaintenanceConfig(data),
Config: r.basicMaintenanceConfigAutoUpgrade(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccKubernetesCluster_basicMaintenanceConfigDefault(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basicMaintenanceConfigDefault(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccKubernetesCluster_basicMaintenanceConfigNodeOs(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basicMaintenanceConfigNodeOs(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
Expand All @@ -529,13 +559,43 @@ func TestAccKubernetesCluster_capacityReservationGroup(t *testing.T) {
})
}

func TestAccKubernetesCluster_completeMaintenanceConfig(t *testing.T) {
func TestAccKubernetesCluster_completeMaintenanceConfigAutoUpgrade(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.completeMaintenanceConfig(data),
Config: r.completeMaintenanceConfigAutoUpgrade(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccKubernetesCluster_completeMaintenanceConfigDefault(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.completeMaintenanceConfigDefault(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccKubernetesCluster_completeMaintenanceConfigNodeOs(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.completeMaintenanceConfigNodeOs(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
Expand All @@ -550,21 +610,64 @@ func TestAccKubernetesCluster_updateMaintenanceConfig(t *testing.T) {

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basicMaintenanceConfig(data),
Config: r.basicMaintenanceConfigDefault(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.completeMaintenanceConfig(data),
Config: r.completeMaintenanceConfigDefault(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.basicMaintenanceConfig(data),
Config: r.basicMaintenanceConfigDefault(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.basicMaintenanceConfigAutoUpgrade(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.completeMaintenanceConfigAutoUpgrade(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.basicMaintenanceConfigAutoUpgrade(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),

{
Config: r.basicMaintenanceConfigNodeOs(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.completeMaintenanceConfigNodeOs(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.basicMaintenanceConfigNodeOs(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
Expand Down Expand Up @@ -1946,7 +2049,43 @@ resource "azurerm_kubernetes_cluster" "test" {
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, controlPlaneVersion, upgradeChannel)
}

func (KubernetesClusterResource) basicMaintenanceConfig(data acceptance.TestData) string {
func (KubernetesClusterResource) basicMaintenanceConfigAutoUpgrade(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%d"
location = "%s"
}

resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%d"
default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_DS2_v2"
}
identity {
type = "SystemAssigned"
}
maintenance_window_auto_upgrade {
frequency = "Weekly"
interval = 1
day_of_week = "Monday"
start_time = "07:00"
utc_offset = "+01:00"
duration = 8
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
}

func (KubernetesClusterResource) basicMaintenanceConfigDefault(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
Expand Down Expand Up @@ -1980,6 +2119,41 @@ resource "azurerm_kubernetes_cluster" "test" {
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
}

func (KubernetesClusterResource) basicMaintenanceConfigNodeOs(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%d"
location = "%s"
}

resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%d"
default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_DS2_v2"
}
identity {
type = "SystemAssigned"
}
maintenance_window_node_os {
frequency = "Daily"
interval = 1
start_time = "07:00"
utc_offset = "+01:00"
duration = 16
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
}

func (KubernetesClusterResource) capacityReservationGroup(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down Expand Up @@ -2044,7 +2218,55 @@ resource "azurerm_kubernetes_cluster" "test" {
`, data.RandomInteger, data.Locations.Primary)
}

func (KubernetesClusterResource) completeMaintenanceConfig(data acceptance.TestData) string {
func (KubernetesClusterResource) completeMaintenanceConfigAutoUpgrade(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%d"
location = "%s"
}

resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%d"
default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_DS2_v2"
}
identity {
type = "SystemAssigned"
}
maintenance_window_auto_upgrade {
frequency = "RelativeMonthly"
interval = 2
duration = 8

day_of_week = "Monday"
week_index = "First"
start_time = "07:00"
utc_offset = "+01:00"
start_date = "2023-11-26T00:00:00Z"

not_allowed {
end = "2023-11-30T00:00:00Z"
start = "2023-11-26T00:00:00Z"
}
not_allowed {
end = "2023-12-30T00:00:00Z"
start = "2023-12-26T00:00:00Z"
}
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
}

func (KubernetesClusterResource) completeMaintenanceConfigDefault(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
Expand Down Expand Up @@ -2082,9 +2304,64 @@ resource "azurerm_kubernetes_cluster" "test" {
hours = [1, 2]
}
allowed {
day = "Sunday"
day = "Thursday"
hours = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
}
allowed {
day = "Friday"
hours = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
}
allowed {
day = "Saturday"
hours = [10, 11, 12, 13, 14, 15, 16]
}
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
}

func (KubernetesClusterResource) completeMaintenanceConfigNodeOs(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%d"
location = "%s"
}

resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%d"
default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_DS2_v2"
}
identity {
type = "SystemAssigned"
}
maintenance_window_node_os {
frequency = "AbsoluteMonthly"
interval = 1
duration = 9

day_of_month = 5
start_time = "07:00"
utc_offset = "+01:00"
start_date = "2023-11-26T00:00:00Z"

not_allowed {
end = "2023-11-30T00:00:00Z"
start = "2023-11-26T00:00:00Z"
}
not_allowed {
end = "2023-12-30T00:00:00Z"
start = "2023-12-26T00:00:00Z"
}
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
Expand Down
Loading