merge main in v1.24 branch (#726)

* chore(deps): bump k8s.io/api from 0.24.3 to 0.24.4 (#685) Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.24.3 to 0.24.4. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](kubernetes/api@v0.24.3...v0.24.4) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump k8s.io/client-go from 0.24.3 to 0.24.4 (#681) Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.24.3 to 0.24.4. - [Release notes](https://github.com/kubernetes/client-go/releases) - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.24.3...v0.24.4) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump golang.org/x/tools from 0.1.11 to 0.1.12 (#660) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.1.11 to 0.1.12. - [Release notes](https://github.com/golang/tools/releases) - [Commits](golang/tools@v0.1.11...v0.1.12) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/aws/aws-sdk-go from 1.44.81 to 1.44.83 (#686) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.81 to 1.44.83. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.44.81...v1.44.83) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: enable cherry-pick bot Signed-off-by: Charles-Edouard Brétéché <[email protected]> * chore(deps): bump github.com/aws/aws-sdk-go from 1.44.83 to 1.44.84 (#690) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.83 to 1.44.84. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.44.83...v1.44.84) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charles-Edouard Brétéché <[email protected]> * chore: add gh action to automate cherry-picks Signed-off-by: Charles-Edouard Brétéché <[email protected]> * chore: add gh action to automate cherry-picks Signed-off-by: Charles-Edouard Brétéché <[email protected]> * chore: enable cherry-pick bot Signed-off-by: Charles-Edouard Brétéché <[email protected]> * fix: build only on long-lived branches Signed-off-by: Charles-Edouard Brétéché <[email protected]> * chore: update rules for PR workflows (#694) Signed-off-by: Charles-Edouard Brétéché <[email protected]> Signed-off-by: Charles-Edouard Brétéché <[email protected]> * chore: update tested CNI (#698) Signed-off-by: Charles-Edouard Brétéché <[email protected]> Signed-off-by: Charles-Edouard Brétéché <[email protected]> * chore(deps): bump github.com/aws/aws-sdk-go from 1.44.84 to 1.44.100 (#723) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.84 to 1.44.100. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.84...v1.44.100) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: upgrade kops to 1.24.3 (#725) Signed-off-by: Charles-Edouard Brétéché <[email protected]> Signed-off-by: Charles-Edouard Brétéché <[email protected]> * chore(deps): bump github.com/hashicorp/terraform-plugin-sdk/v2 (#724) Bumps [github.com/hashicorp/terraform-plugin-sdk/v2](https://github.com/hashicorp/terraform-plugin-sdk) from 2.21.0 to 2.23.0. - [Release notes](https://github.com/hashicorp/terraform-plugin-sdk/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-sdk/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-plugin-sdk@v2.21.0...v2.23.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-sdk/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charles-Edouard Brétéché <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Charles-Edouard Brétéché <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
eddycharly · Sep 17, 2022 · e539c62 · e539c62
1 parent ee64efb
commit e539c62
Show file tree

Hide file tree

Showing 23 changed files with 1,061 additions and 37 deletions.
diff --git a/.github/cherry-pick-bot.yml b/.github/cherry-pick-bot.yml
@@ -0,0 +1 @@
+enabled: true
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        tf-version: [0.15.5, 1.0.11, 1.1.9]
+        tf-version: [0.15.5, 1.0.11, 1.1.9, 1.2.9]
     runs-on: ubuntu-latest
     steps:
       - name: Install goimports

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ integration with the kOps api:
 
 ... just **pure go code.**
 
-Currently using kOps `v1.24.1` and compatible with terraform `0.15` and higher.
+Currently using kOps `v1.24.3` and compatible with terraform `0.15` and higher.
 
 **NOTES**
 - For now, provisioning the network is not supported. The network must

diff --git a/docs/data-sources/cluster.md b/docs/data-sources/cluster.md
@@ -279,6 +279,9 @@ OpenstackNetwork defines the config for a network.
 The following arguments are supported:
 
 - `availability_zone_hints` - (Computed) - List(String)
+- `ipv6_support_disabled` - (Computed) - Bool
+- `public_network_names` - (Computed) - List(String)
+- `internal_network_names` - (Computed) - List(String)
 
 ### openstack_metadata
 
@@ -480,6 +483,7 @@ The following arguments are supported:
 - `state` - (Computed) - String - State directory for execution state files (default "/run/containerd").
 - `version` - (Computed) - String - Version used to pick the containerd package.
 - `nvidia_gpu` - (Computed) - [nvidia_gpu_config](#nvidia_gpu_config) - NvidiaGPU configures the Nvidia GPU runtime.
+- `runc` - (Computed) - [runc](#runc) - Runc configures the runc runtime.
 
 ### packages_config
 
@@ -501,6 +505,15 @@ The following arguments are supported:
 - `driver_package` - (Computed) - String - Package is the name of the nvidia driver package that will be installed.<br />Default is "nvidia-headless-510-server".
 - `enabled` - (Computed) - Bool - Enabled determines if kOps will install the Nvidia GPU runtime and drivers.<br />They will only be installed on intances that has an Nvidia GPU.
 
+### runc
+
+#### Argument Reference
+
+The following arguments are supported:
+
+- `version` - (Computed) - String - Version used to pick the runc package.
+- `packages` - (Computed) - [packages_config](#packages_config) - Packages overrides the URL and hash for the packages.
+
 ### docker_config
 
 DockerConfig is the configuration for docker.

diff --git a/docs/data-sources/instance_group.md b/docs/data-sources/instance_group.md
@@ -399,6 +399,7 @@ The following arguments are supported:
 - `state` - (Computed) - String - State directory for execution state files (default "/run/containerd").
 - `version` - (Computed) - String - Version used to pick the containerd package.
 - `nvidia_gpu` - (Computed) - [nvidia_gpu_config](#nvidia_gpu_config) - NvidiaGPU configures the Nvidia GPU runtime.
+- `runc` - (Computed) - [runc](#runc) - Runc configures the runc runtime.
 
 ### packages_config
 
@@ -420,6 +421,15 @@ The following arguments are supported:
 - `driver_package` - (Computed) - String - Package is the name of the nvidia driver package that will be installed.<br />Default is "nvidia-headless-510-server".
 - `enabled` - (Computed) - Bool - Enabled determines if kOps will install the Nvidia GPU runtime and drivers.<br />They will only be installed on intances that has an Nvidia GPU.
 
+### runc
+
+#### Argument Reference
+
+The following arguments are supported:
+
+- `version` - (Computed) - String - Version used to pick the runc package.
+- `packages` - (Computed) - [packages_config](#packages_config) - Packages overrides the URL and hash for the packages.
+
 ### accelerator_config
 
 AcceleratorConfig defines an accelerator config.

diff --git a/docs/index.md b/docs/index.md
@@ -9,7 +9,7 @@ integration with the kOps api:
 
 ... just **pure go code.**
 
-Currently using kOps `v1.24.1` and compatible with terraform `0.15` and higher.
+Currently using kOps `v1.24.3` and compatible with terraform `0.15` and higher.
 
 ~> For now, provisioning the network is not supported. The network must
 be created separately and given to the provider through cluster attribute

diff --git a/docs/resources/cluster.md b/docs/resources/cluster.md
@@ -365,6 +365,9 @@ OpenstackNetwork defines the config for a network.
 The following arguments are supported:
 
 - `availability_zone_hints` - (Optional) - List(String)
+- `ipv6_support_disabled` - (Optional) - Bool
+- `public_network_names` - (Optional) - List(String)
+- `internal_network_names` - (Optional) - List(String)
 
 ### openstack_metadata
 
@@ -566,6 +569,7 @@ The following arguments are supported:
 - `state` - (Optional) - String - State directory for execution state files (default "/run/containerd").
 - `version` - (Optional) - String - Version used to pick the containerd package.
 - `nvidia_gpu` - (Optional) - [nvidia_gpu_config](#nvidia_gpu_config) - NvidiaGPU configures the Nvidia GPU runtime.
+- `runc` - (Optional) - [runc](#runc) - Runc configures the runc runtime.
 
 ### packages_config
 
@@ -587,6 +591,15 @@ The following arguments are supported:
 - `driver_package` - (Optional) - String - Package is the name of the nvidia driver package that will be installed.<br />Default is "nvidia-headless-510-server".
 - `enabled` - (Optional) - Bool - Enabled determines if kOps will install the Nvidia GPU runtime and drivers.<br />They will only be installed on intances that has an Nvidia GPU.
 
+### runc
+
+#### Argument Reference
+
+The following arguments are supported:
+
+- `version` - (Optional) - String - Version used to pick the runc package.
+- `packages` - (Optional) - [packages_config](#packages_config) - Packages overrides the URL and hash for the packages.
+
 ### docker_config
 
 DockerConfig is the configuration for docker.

diff --git a/docs/resources/instance_group.md b/docs/resources/instance_group.md
@@ -433,6 +433,7 @@ The following arguments are supported:
 - `state` - (Optional) - String - State directory for execution state files (default "/run/containerd").
 - `version` - (Optional) - String - Version used to pick the containerd package.
 - `nvidia_gpu` - (Optional) - [nvidia_gpu_config](#nvidia_gpu_config) - NvidiaGPU configures the Nvidia GPU runtime.
+- `runc` - (Optional) - [runc](#runc) - Runc configures the runc runtime.
 
 ### packages_config
 
@@ -454,6 +455,15 @@ The following arguments are supported:
 - `driver_package` - (Optional) - String - Package is the name of the nvidia driver package that will be installed.<br />Default is "nvidia-headless-510-server".
 - `enabled` - (Optional) - Bool - Enabled determines if kOps will install the Nvidia GPU runtime and drivers.<br />They will only be installed on intances that has an Nvidia GPU.
 
+### runc
+
+#### Argument Reference
+
+The following arguments are supported:
+
+- `version` - (Optional) - String - Version used to pick the runc package.
+- `packages` - (Optional) - [packages_config](#packages_config) - Packages overrides the URL and hash for the packages.
+
 ### accelerator_config
 
 AcceleratorConfig defines an accelerator config.

diff --git a/go.mod b/go.mod
@@ -4,15 +4,15 @@ go 1.18
 
 require (
 	github.com/Masterminds/sprig v2.22.0+incompatible
-	github.com/aws/aws-sdk-go v1.44.81
-	github.com/google/go-cmp v0.5.8
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.21.0
-	golang.org/x/tools v0.1.11
-	k8s.io/api v0.24.3
-	k8s.io/apimachinery v0.24.3
-	k8s.io/client-go v0.24.3
+	github.com/aws/aws-sdk-go v1.44.100
+	github.com/google/go-cmp v0.5.9
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.23.0
+	golang.org/x/tools v0.1.12
+	k8s.io/api v0.24.4
+	k8s.io/apimachinery v0.24.4
+	k8s.io/client-go v0.24.4
 	k8s.io/klog v1.0.0
-	k8s.io/kops v1.24.1
+	k8s.io/kops v1.24.3
 )
 
 require (
@@ -100,7 +100,7 @@ require (
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.13.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.14.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/hashicorp/terraform-plugin-go v0.14.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
@@ -165,16 +165,16 @@ require (
 	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
-	github.com/zclconf/go-cty v1.10.0 // indirect
+	github.com/zclconf/go-cty v1.11.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
-	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
-	golang.org/x/sys v0.0.0-20220721230656-c6bc011c0c49 // indirect
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect