Add params to machinepool and support instance configuration upgrade

oracle · Nov 30, 2022 · 6428e3f · 6428e3f
1 parent cd3d7f8
commit 6428e3f
Show file tree

Hide file tree

Showing 32 changed files with 2,554 additions and 592 deletions.
diff --git a/Makefile b/Makefile
@@ -326,7 +326,7 @@ envsubst: $(ENVSUBST) ## Build a local copy of envsubst.
 kubectl: $(KUBECTL) ## Build a local copy of kubectl.
 
 $(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
-	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.7.0
+	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.10.0
 
 $(KUSTOMIZE): ## Download kustomize locally if necessary.
 	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/kustomize/kustomize/v4 $(KUSTOMIZE_BIN) v4.5.2

diff --git a/api/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1beta1 contains API Schema definitions for the infrastructure v1beta1 API group
-//+kubebuilder:object:generate=true
-//+groupName=infrastructure.cluster.x-k8s.io
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
 package v1beta1
 
 import (

diff --git a/api/v1beta1/ocimachine_types.go b/api/v1beta1/ocimachine_types.go
@@ -74,13 +74,13 @@ type OCIMachineSpec struct {
 	// PreemptibleInstanceConfig Configuration options for preemptible instances.
 	PreemptibleInstanceConfig *PreemptibleInstanceConfig `json:"preemptibleInstanceConfig,omitempty"`
 
-	// LaunchInstanceAgentConfig defines the options for the Oracle Cloud Agent software running on the instance.
+	// AgentConfig defines the options for the Oracle Cloud Agent software running on the instance.
 	AgentConfig *LaunchInstanceAgentConfig `json:"agentConfig,omitempty"`
 
 	// InstanceSourceViaImageConfig defines the options for booting up instances via images
 	InstanceSourceViaImageDetails *InstanceSourceViaImageConfig `json:"instanceSourceViaImageConfig,omitempty"`
 
-	// InstanceSourceViaImageConfig defines the platform config parameters
+	// PlatformConfig defines the platform config parameters
 	PlatformConfig *PlatformConfig `json:"platformConfig,omitempty"`
 
 	// DedicatedVmHostId defines the OCID of the dedicated VM host.

diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go
@@ -878,7 +878,7 @@ type VCN struct {
 	NetworkSecurityGroups []*NSG `json:"networkSecurityGroups,omitempty"`
 }
 
-//LoadBalancer Configuration
+// LoadBalancer Configuration
 type LoadBalancer struct {
 	//LoadBalancer Name.
 	// +optional

diff --git a/cloud/scope/clients_mock.go b/cloud/scope/clients_mock.go
@@ -84,7 +84,7 @@ func MockAuthConfig() (config.AuthConfig, error) {
 	authConfig := config.AuthConfig{
 		UseInstancePrincipals: false,
 		Region:                MockTestRegion,
-		Fingerprint:           "mock-finger-print",
+		Fingerprint:           "mock_computemanagement-finger-print",
 		PrivateKey:            privateKey,
 		UserID:                "ocid1.tenancy.oc1..<unique_ID>",
 		TenancyID:             "ocid1.tenancy.oc1..<unique_ID>",

diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go
@@ -537,7 +537,7 @@ func (m *MachineScope) ReconcileCreateInstanceOnLB(ctx context.Context) error {
 // ReconcileDeleteInstanceOnLB checks to make sure the instance is part of a backend set then deletes the backend
 // on the NetworkLoadBalancer
 //
-// It will await the Work Request completion before returning
+// # It will await the Work Request completion before returning
 //
 // See https://docs.oracle.com/en-us/iaas/Content/NetworkLoadBalancer/BackendServers/backend_server_management.htm#BackendServerManagement
 // for more info on Backend Server Management