diff --git a/image/install.py b/image/install.py index c30e49f524..2faca09cfd 100755 --- a/image/install.py +++ b/image/install.py @@ -46,7 +46,7 @@ def copy_driver_binary(): #Copy executable atomically copyfile(DRIVER_EXEC_PATH, "{}/.{}".format(DRIVER_DIRECTORY, DRIVER)) os.rename("{}/.{}".format(DRIVER_DIRECTORY, DRIVER), "{}/{}".format(DRIVER_DIRECTORY, DRIVER)) - os.chmod("{}/{}".format(DRIVER_DIRECTORY, DRIVER), 755) + os.chmod("{}/{}".format(DRIVER_DIRECTORY, DRIVER), 0755) def generate_kubeconfig(): script_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml b/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml index 0a7d851cb8..993bdb46c5 100644 --- a/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml +++ b/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml @@ -42,7 +42,7 @@ spec: path: /etc/kubernetes containers: - name: oci-cloud-controller-manager - image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.3 + image: ghcr.io/oracle/cloud-provider-oci:v1.29.2 command: ["/usr/local/bin/oci-cloud-controller-manager"] args: - --cloud-config=/etc/oci/cloud-provider.yaml diff --git a/manifests/container-storage-interface/oci-csi-controller-driver.yaml b/manifests/container-storage-interface/oci-csi-controller-driver.yaml index f45861e43c..287e600efa 100644 --- a/manifests/container-storage-interface/oci-csi-controller-driver.yaml +++ b/manifests/container-storage-interface/oci-csi-controller-driver.yaml @@ -96,7 +96,7 @@ spec: - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock command: - /usr/local/bin/oci-csi-controller-driver - image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.3 + image: ghcr.io/oracle/cloud-provider-oci:v1.29.2 imagePullPolicy: IfNotPresent volumeMounts: - name: config diff --git a/manifests/container-storage-interface/oci-csi-node-driver.yaml b/manifests/container-storage-interface/oci-csi-node-driver.yaml index 852343781f..4200de8be9 100644 --- a/manifests/container-storage-interface/oci-csi-node-driver.yaml +++ b/manifests/container-storage-interface/oci-csi-node-driver.yaml @@ -117,7 +117,7 @@ spec: fieldPath: spec.nodeName - name: PATH value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin - image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.3 + image: ghcr.io/oracle/cloud-provider-oci:v1.29.2 securityContext: privileged: true volumeMounts: diff --git a/manifests/flexvolume-driver/oci-flexvolume-driver.yaml b/manifests/flexvolume-driver/oci-flexvolume-driver.yaml index 81706fbebf..632dc4ec11 100644 --- a/manifests/flexvolume-driver/oci-flexvolume-driver.yaml +++ b/manifests/flexvolume-driver/oci-flexvolume-driver.yaml @@ -40,7 +40,7 @@ spec: secretName: oci-flexvolume-driver containers: - name: oci-flexvolume-driver - image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.3 + image: ghcr.io/oracle/cloud-provider-oci:v1.29.2 command: ["/usr/local/bin/install.py", "-c", "/tmp/config.yaml"] securityContext: privileged: true @@ -76,7 +76,7 @@ spec: type: DirectoryOrCreate containers: - name: oci-flexvolume-driver - image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.3 + image: ghcr.io/oracle/cloud-provider-oci:v1.29.2 command: ["/usr/local/bin/install.py"] securityContext: privileged: true diff --git a/manifests/provider-config-example.yaml b/manifests/provider-config-example.yaml index 82e79ecf42..22ebd99e63 100644 --- a/manifests/provider-config-example.yaml +++ b/manifests/provider-config-example.yaml @@ -1,61 +1,38 @@ auth: - region: us-ashburn-1 - tenancy: ocid1.tenancy.oc1..aaaaaaaajol5woa4is3merb234fy4b46bps2nsjr3lcz7rvgj25dr5dxfmnq - user: ocid1.user.oc1..aaaaaaaaxvygorqdp67kwdjfmvbnsoynbkp7z2erqvr3gflajwoxs3faagcq + region: us-phoenix-1 + tenancy: ocid1.tenancy.oc1..aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + user: ocid1.user.oc1..aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa key: | - -----BEGIN PRIVATE KEY----- - MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDx8j7Hsla9cKxb - EeZeQFBBP6Zxx/QToMmoZDaSqcAQAoDEjjG8QLslAQXAI2QrjtFhwIauwdsYOAYZ - Y3DtaEwrzn74K8te1/oyB1pm4zUm2uSvAaprTyLjLIYWISaTJGujzNwqns7zjxzF - 2U4Clcap+v0KFuN212+5hn93UeR0s3RZlEQRyEOXHg+d4l/fHlIao/z4EXyEntzc - oo88ark7qg8CBzbkU6Rq7jBa3iF5bIOl9xVS1wKuxU/hx5BCWB5VPuB5iTkQm/XR - 5Tm/cW12t4eL48VcE6nQSYqzCyBHKDd29YEhHLpbh0p1/t0+23Ui1ILFAK65WPtA - KNaXLb77AgMBAAECggEAF1onyBOE/rzgzdtw7jjr5hhUIthHTRuwSxH9GHPM516u - ego1b7OZvI0YNn7T/MZInFQ+S6DHWlOR9yJbdHakH3hLVf24H9vduLVv+s1ERI9N - Ej0pazkUp3OVL46ckAgsYX904qI4XFa8UrZSKrq1FZP1l2M1KjPKA1Chfe1IDSFS - 9zd107Iw2wXzj5s6OjiAAz18hX1WNR4Pt7wZL9PtbU+HKuBsgB+FM293Y5cT5YQ8 - vceLPUx2Hmzv7dA42Bgma2WvX+WigrRLlaA7RwYOK0wrzgCBra3fbUaprm9HijHE - uqYz7sYkIZWTbFUWDL997oEQu/R2O2r5iLeIFV2aYQKBgQD5BprLBjEDxBK3VPOu - g1CLuhUMWePBxdkziqTgOfpQgst+LGRv+xTohXnOcosYAEIOdm8hcI0aeoN4G2yP - jgyCSwg+gfWCcTma/JDVkUHT1oDh7JNay4TWKkF7td434F5s90rxe6Bk8NRyQfqI - Yfr9TWDkx94S9wABvOXxivlroQKBgQD4uOI9m2ymwQWyG7G61LjnEW/4C5kXYqtS - RnGi875TbLmOSefYjftbUFUBE/55IRhlrz8QPYXOwJvWFctNv5t1XiqfO2LOylT3 - qXyVQvRShigSvuOkko8lb0U7e6YzZUITAYpxqISdJIiXp83sQG8fGd4/teXqGIrq - /v/C371FGwKBgQC6nVByxHkGsXC1Ilxact1xWEldsB8VnwZdsZBM2CXVH68PJoU9 - xZKtjRjytLO3kLnvzKELFiUnqpfK8gIwsep92WycKxeoYOEiXBLNeMUz0pNSus7S - Q6GQPKpF4sxcYy9fyRHIVTSlcDRES11LxuEn4UyzJXQuEhtXMg+/Kr4vAQKBgQDG - 9N3E+jcHjQ/JUW3yTYc7Dy/J8z0a/8qbnc3405FDmo0zzNqw16JhgPj+S8gbjOW/ - MVf43b3TjS8bKYPfRY5NbG4bwZ1gXWlqUyFdJJncCYS0ug3O742iHEf9NQPVyQH5 - whnEoVCzgy3gYlLO0RwSfNbTj+XCRK+bGy/r6p20UQKBgQDlLFhUzo3GFl2tyPBH - 7V4L1IuDnQ8+aZCUcLYE1vbUqrruBwsa9pRJbAa07aWlY6vNK7G6Tb/+AuMGu2Dm - q9ZOnExtW/qCQzKz9r0fj7Qd/y3YZb10q8npm2cPU+MkAK8+FmYSSV1gb8L5Y5zi - dnmsQh4yc0q4sAqQR75PiiPbEA== - -----END PRIVATE KEY----- - fingerprint: b2:79:69:6f:32:c7:c7:cf:85:20:82:da:e5:1e:e8:0d + -----BEGIN RSA PRIVATE KEY----- + + -----END RSA PRIVATE KEY----- + # Omit if there is not a password for the key + passphrase: supersecretpassword + fingerprint: 8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74 # Omit all of the above options then set useInstancePrincipals to true if you # want to use Instance Principals API access # (https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Tasks/callingservicesfrominstances.htm). - # Ensure you have set up the following OCI policies and your kubernetes nodes are running within them + # Ensure you have setup the following OCI policies and your kubernetes nodes are running within them # allow dynamic-group [your dynamic group name] to read instance-family in compartment [your compartment name] # allow dynamic-group [your dynamic group name] to use virtual-network-family in compartment [your compartment name] # allow dynamic-group [your dynamic group name] to manage load-balancers in compartment [your compartment name] useInstancePrincipals: false # compartment configures Compartment within which the cluster resides. -compartment: ocid1.compartment.oc1..aaaaaaaaee2fxlf36idmiqlyvnyhkh2oquz5loogbmzat73hnnqhu2c3352a +compartment: ocid1.compartment.oc1..aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # vcn configures the Virtual Cloud Network (VCN) within which the cluster resides. -vcn: "ocid1.vcn.oc1.iad.amaaaaaa27mmasaatg7jx6sxhkn4idung2qwuy4omsyqtnisykdp62fxqukq" +vcn: ocid1.vcn.oc1..aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa loadBalancer: # subnet1 configures one of two subnets to which load balancers will be added. # OCI load balancers require two subnets to ensure high availability. - subnet1: ocid1.subnet.oc1.iad.aaaaaaaabl3ayjyycxd6imwiqok5gghg73kgieibqijseyhkkpsu6dvkjhga + subnet1: ocid1.subnet.oc1.phx.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # subnet2 configures the second of two subnets to which load balancers will be # added. OCI load balancers require two subnets to ensure high availability. - # subnet2: ocid1.subnet.oc1.phx.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + subnet2: ocid1.subnet.oc1.phx.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # SecurityListManagementMode configures how security lists are managed by the CCM. # If you choose to have security lists managed by the CCM, ensure you have setup the following additional OCI policy: @@ -71,14 +48,14 @@ loadBalancer: # user has setup a rule that allows inbound traffic to the # appropriate ports for kube proxy health port, node port # ranges, and health check port ranges. E.g. 10.82.0.0/16 30000-32000. - # Additionally requires the user to manage rules to allow + # Additionally requires the user to mange rules to allow # inbound traffic to load balancers. securityListManagementMode: All # Optional specification of which security lists to modify per subnet. This does not apply if security list management is off. -# securityLists: -# ocid1.subnet.oc1.phx.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: ocid1.securitylist.oc1.iad.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -# ocid1.subnet.oc1.phx.bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: ocid1.securitylist.oc1.iad.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + securityLists: + ocid1.subnet.oc1.phx.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: ocid1.securitylist.oc1.iad.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + ocid1.subnet.oc1.phx.bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: ocid1.securitylist.oc1.iad.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # Optional rate limit controls for accessing OCI API rateLimiter: diff --git a/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml b/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml index e084e5f6f9..46d4f18764 100644 --- a/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml +++ b/manifests/volume-provisioner/oci-volume-provisioner-fss.yaml @@ -35,7 +35,7 @@ spec: secretName: oci-volume-provisioner containers: - name: oci-volume-provisioner - image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.3 + image: ghcr.io/oracle/cloud-provider-oci:v1.29.2 command: ["/usr/local/bin/oci-volume-provisioner"] env: - name: NODE_NAME diff --git a/manifests/volume-provisioner/oci-volume-provisioner.yaml b/manifests/volume-provisioner/oci-volume-provisioner.yaml index 6540dc36f2..e791054ac2 100644 --- a/manifests/volume-provisioner/oci-volume-provisioner.yaml +++ b/manifests/volume-provisioner/oci-volume-provisioner.yaml @@ -35,7 +35,7 @@ spec: secretName: oci-volume-provisioner containers: - name: oci-volume-provisioner - image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.29.3 + image: ghcr.io/oracle/cloud-provider-oci:v1.29.2 command: ["/usr/local/bin/oci-volume-provisioner"] env: - name: NODE_NAME