Skip to content

Commit

Permalink
Merge pull request #981 from joekr/add-oci-base-image-ocid-param
Browse files Browse the repository at this point in the history
feat: add `base_image_ocid` param for CAPI Oracle Cloud provider
  • Loading branch information
k8s-ci-robot authored Sep 22, 2022
2 parents c30de74 + 0ffee3c commit 4b97ae8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion docs/book/src/capi/providers/oci.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ building OCI images are managed by running the following command from images/cap
make deps-oci
```

From the `images/capi` directory, run `make build-do-<OS>` where `<OS>` is
From the `images/capi` directory, run `make build-oci-<OS>` where `<OS>` is
the desired operating system. The available choices are listed via `make help`.

### Configuration
Expand Down
2 changes: 2 additions & 0 deletions images/capi/packer/oci/packer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"operating_system": "{{user `operating_system`}}",
"operating_system_version": "{{user `operating_system_version`}}"
},
"base_image_ocid": "{{user `base_image_ocid`}}",
"compartment_ocid": "{{user `compartment_ocid`}}",
"fingerprint": "{{user `fingerprint`}}",
"image_name": "cluster-api-{{user `build_name`}}-{{user `kubernetes_semver`}}-{{user `build_timestamp`}}",
Expand Down Expand Up @@ -101,6 +102,7 @@
"ansible_extra_vars": "",
"ansible_user_vars": "",
"availability_domain": "{{env `OCI_AVAILABILITY_DOMAIN`}}",
"base_image_ocid": "",
"build_timestamp": "{{timestamp}}",
"compartment_ocid": "",
"containerd_sha256": null,
Expand Down

0 comments on commit 4b97ae8

Please sign in to comment.