Skip to content

Commit 8f44494

Browse files
marinakogmarkxnelson
authored andcommitted
OWLS-76654, add ability properly process the property file with commented out values, fix typo in the README.md for terraform (#1241)
1 parent 19a93ec commit 8f44494

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

kubernetes/samples/scripts/terraform/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Copy provided `oci.props.template` file to `oci.props` and add all required valu
3636
* `vcn.cidr.prefix` - Prefix for VCN CIDR, used when creating subnets -- you should examine the target compartment find a CIDR that is available.
3737
* `vcn.cidr` - Full CIDR for the VCN, must be unique within the compartment, first 2 octets should match the vcn_cidr_prefix.
3838
* `nodepool.shape` - A valid OCI VM Shape for the cluster nodes.
39-
* `k8s.version` - SSH public key (key contents as a string).
39+
* `k8s.version` - Kubernetes version.
40+
* `nodepool.ssh.pubkey` - SSH public key (key contents as a string).
4041
* `nodepool.imagename` - A valid image name for Node Pool creation.
4142
* `terraform.installdir` - Location to install Terraform binaries.
4243

kubernetes/samples/scripts/terraform/oke.create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

55
function prop {
6-
grep "${1}" ${propsFile}|cut -d'=' -f2
6+
grep "${1}" ${propsFile}| grep -v "#" | cut -d'=' -f2
77
}
88

99
function generateTFVarFile {

0 commit comments

Comments
 (0)