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

Jump to bottom

Add params to machinepool and support instance configuration upgrade #183

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Add params to machinepool and support instance configuration upgrade #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions api/v1beta1/ocimachine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cloud/scope/clients_mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>",
Expand Down
586 changes: 476 additions & 110 deletions cloud/scope/machine_pool.go
View file
Open in desktop

Large diffs are not rendered by default.