feat(cloud): implement CRUD functions for Kubernetes cloud resource #598

anvial · 2024-09-27T15:06:19Z

Description

Added CRUD methods in kubernetesCloudsClient to handle the creation of Kubernetes clouds.
Integrated the new method into the Terraform provider's CRUD functions in kubernetesCloudResource.
Updated the schema and model to include necessary attributes for Kubernetes cloud create/read/update/delete.

Type of change

Change existing resource

Environment

Juju controller version:
Terraform version:

QA steps

# get k8s cloud config yaml
microk8s.config view > test-k8s-config.yaml

terraform {
  required_providers {
    juju = {
      version = "0.15.0"
      source  = "juju/juju"
    }
  }
}

resource "juju_kubernetes_cloud" "test-k8s-cloud" {
  name = "test-k8s-cloud"
  kubernetesconfig = file("<path-to-test-k8s-config.yaml>")
}

juju clouds --controller <controller_name>
# output should demonstrate freshly added cloud to the controller

hmlanigan

The PR description does not match the code. Import, Read and Delete were also implemented.

internal/juju/kubernetes_clouds.go

internal/provider/resource_kubernetes_cloud.go

internal/juju/kubernetes_clouds.go

internal/provider/resource_kubernetes_cloud.go

hmlanigan · 2024-09-30T19:22:56Z

internal/provider/resource_kubernetes_cloud.go

+	cloud, err := o.client.Clouds.ReadKubernetesCloud(
+		&juju.ReadKubernetesCloudInput{
+			Name:             plan.CloudName.ValueString(),
+			KubernetesConfig: plan.KubernetesConfig.ValueString(),
+		},
+	)


issue: Import will not work if Read is implemented this way. You have to get the name from the ID.

internal/provider/resource_kubernetes_cloud.go

internal/juju/kubernetes_clouds.go

internal/provider/resource_kubernetes_cloud.go

Aflynn50

Left some comments, am trying some QA now!

internal/juju/kubernetes_clouds.go

internal/provider/resource_kubernetes_cloud.go

internal/juju/interfaces.go

internal/juju/kubernetesClouds.go

internal/juju/kubernetesClouds_test.go

internal/provider/resource_kubernetes_cloud.go

internal/provider/resource_kubernetes_cloud_test.go

internal/provider/resource_kubernetes_cloud.go

hmlanigan · 2024-10-04T19:52:13Z

internal/juju/kubernetesClouds_test.go

+	ctlr := s.setupMocks(s.T())
+	defer ctlr.Finish()
+
+	s.mockKubernetesCloudClient.EXPECT().AddCloud(gomock.Any(), gomock.Any()).Return(nil).AnyTimes()


Should check some of the input to ensure it's correct.

internal/juju/kubernetesClouds_test.go

hmlanigan · 2024-10-04T19:54:36Z

internal/juju/kubernetesClouds.go

+		return errors.Trace(err)
+	}
+
+	err = kubernetesAPIClient.UpdateCloud(newCloud)


I'm wondering if the created credential will need an update too?

Hmm... and what is your suggestion? to take credentials from the state and compare?

examples/resources/juju_kubernetes_cloud/import.sh

hmlanigan

Thanks for all the work @anvial!

hmlanigan · 2024-10-08T21:22:38Z

/merge

- Added `CreateKubernetesCloud` method in `kubernetesCloudsClient` to handle the creation of Kubernetes clouds. - Integrated the new method into the Terraform provider's kubernetes resouce `Create` function in `kubernetesCloudResource`. - Updated the schema and model to include necessary attributes for Kubernetes cloud creation.

… resource - Added `Read` function in `kubernetesCloudResource` to handle reading the current state of the Kubernetes cloud. - Implemented `Delete` function in `kubernetesCloudResource` to handle the removal of Kubernetes clouds. - Integrated the new methods into the Terraform provider's resource lifecycle. - Updated the schema and model to ensure proper state management during read and delete operations.

- Added `Update` function in `kubernetesCloudResource` to handle updating the Kubernetes cloud. - Integrated the new method into the Terraform provider's resource lifecycle. - Updated the schema and model to ensure proper state management during update operations.

Combine into one step and do not test for a condition not found in this job.

…benetes_config

hmlanigan · 2024-10-08T21:43:16Z

I had to do one last force push to sign one of the commits, merge was failing otherwise.

hmlanigan · 2024-10-09T12:46:55Z

/merge

anvial requested a review from hmlanigan September 27, 2024 15:06

anvial force-pushed the JUJU-6811-implement-kubernetes-cloud-resource-create-function branch 2 times, most recently from f861c1a to a5cafb4 Compare September 30, 2024 09:53

hmlanigan reviewed Sep 30, 2024

View reviewed changes

Aflynn50 self-requested a review October 1, 2024 11:43

anvial changed the title ~~feat(kubernetes-cloud): implement create function for Kubernetes cloud resource~~ feat(cloud): implement CRUD functions for Kubernetes cloud resource Oct 2, 2024

anvial force-pushed the JUJU-6811-implement-kubernetes-cloud-resource-create-function branch 2 times, most recently from ee55703 to 988feb7 Compare October 2, 2024 10:36

Aflynn50 reviewed Oct 2, 2024

View reviewed changes

anvial force-pushed the JUJU-6811-implement-kubernetes-cloud-resource-create-function branch from b96479c to 74e8d91 Compare October 3, 2024 13:47

hmlanigan reviewed Oct 4, 2024

View reviewed changes

anvial force-pushed the JUJU-6811-implement-kubernetes-cloud-resource-create-function branch 3 times, most recently from 232a4c8 to 8da2f56 Compare October 7, 2024 13:22

hmlanigan reviewed Oct 7, 2024

View reviewed changes

examples/resources/juju_kubernetes_cloud/import.sh Outdated Show resolved Hide resolved

hmlanigan force-pushed the JUJU-6811-implement-kubernetes-cloud-resource-create-function branch 2 times, most recently from d63c33b to 44b5a11 Compare October 7, 2024 20:10

anvial force-pushed the JUJU-6811-implement-kubernetes-cloud-resource-create-function branch 2 times, most recently from 60cf3b8 to 351f4d3 Compare October 8, 2024 14:54

hmlanigan added this to the 0.15.0 milestone Oct 8, 2024

hmlanigan approved these changes Oct 8, 2024

View reviewed changes

anvial added 8 commits October 8, 2024 21:41

chore: drop kubernetes config from Read input

d7ef9a5

feat: add support parent cloud namd and region in the create func

5202ff1

fix: use method Cloud() instead Clouds() to read info from Juju

797b308

test: add unit-tests for kubernetsClouds client

ac706b6

docs: add example of kubernetes cloud to the docs

78aa6d3

anvial and others added 20 commits October 8, 2024 21:41

fix: fix kubernetes clouds unit-tests

70218ef

fix: add credentials while adding the cloud to controller

295bb12

docs: add model to the example

1b21c20

test: add ACC test for kubernetes cloud resource

9bff6dc

feat: implement ImportState function

124e7b8

test: fix ACC test for kubernetes cloud resource

de51d28

test: move ACC test to microk8s cloud

f9052f7

test: move ACC test back to LXD, fix microk8s setup for LXD

d1fb1a0

test: add ACC test with model

c4fa324

fix: fix intergration test runner setup

e5d9320

fix: update intergration jaas tests to use microk8s config

72dbc15

fix: drop ImportState for kubernetes cloud

0e959ae

test: fix microk8s setup for k8s cloud test

9db7793

Combine into one step and do not test for a condition not found in this job.

chore: remove commented out code

6c6e901

fix: update new copyright to correct year

a611d4f

test: fix permissions for microk8s install

89565d0

test: add AddCredential call to Create k8s cloud unit-test

c132806

fix: put microk8s config to envvar

28efcbf

test: use file in the scenario instead EOF

90cc072

test: skip this ACC test until we have a way to run correctly with ku…

fd816d3

…benetes_config

hmlanigan force-pushed the JUJU-6811-implement-kubernetes-cloud-resource-create-function branch from 7b0e404 to fd816d3 Compare October 8, 2024 21:42

jujubot merged commit 21c1238 into juju:main Oct 9, 2024
22 of 31 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(cloud): implement CRUD functions for Kubernetes cloud resource #598

feat(cloud): implement CRUD functions for Kubernetes cloud resource #598

anvial commented Sep 27, 2024 •

edited

Loading

hmlanigan left a comment

hmlanigan Sep 30, 2024

Aflynn50 left a comment

hmlanigan Oct 4, 2024

hmlanigan Oct 4, 2024

anvial Oct 8, 2024

hmlanigan left a comment

hmlanigan commented Oct 8, 2024

hmlanigan commented Oct 8, 2024

hmlanigan commented Oct 9, 2024

feat(cloud): implement CRUD functions for Kubernetes cloud resource #598

feat(cloud): implement CRUD functions for Kubernetes cloud resource #598

Conversation

anvial commented Sep 27, 2024 • edited Loading

Description

Type of change

Environment

QA steps

hmlanigan left a comment

Choose a reason for hiding this comment

hmlanigan Sep 30, 2024

Choose a reason for hiding this comment

Aflynn50 left a comment

Choose a reason for hiding this comment

hmlanigan Oct 4, 2024

Choose a reason for hiding this comment

hmlanigan Oct 4, 2024

Choose a reason for hiding this comment

anvial Oct 8, 2024

Choose a reason for hiding this comment

hmlanigan left a comment

Choose a reason for hiding this comment

hmlanigan commented Oct 8, 2024

hmlanigan commented Oct 8, 2024

hmlanigan commented Oct 9, 2024

anvial commented Sep 27, 2024 •

edited

Loading