Skip to content

Commit

Permalink
Manifest and Third Party License
Browse files Browse the repository at this point in the history
  • Loading branch information
YashwantGohokar committed Feb 18, 2025
1 parent 9ecde5d commit 4a6b948
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ else
VERSION ?= ${VERSION}
endif

RELEASE = v1.30.0
RELEASE = v1.30.1

GOOS ?= linux
ARCH ?= amd64
Expand Down
13 changes: 11 additions & 2 deletions THIRD_PARTY_LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
SPDX:Apache-2.0

---------------------------------- Copyright -----------------------------------
Copyright (C) 2017, 2025, Oracle and/or its affiliates.
Copyright (C) 2018, 2025, Oracle and/or its affiliates.
Copyright (C) 2019, 2025, Oracle and/or its affiliates.
Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright 2014 The Kubernetes Authors.
Copyright 2016 The Kubernetes Authors.
Expand Down Expand Up @@ -1179,6 +1182,7 @@ SPDX:MIT

== Copyright
Copyright (c) 2013-2014 Onsi Fakhouri
Copyright (c) 2014 Amit Kumar Gupta

--------------------------------- (separator) ----------------------------------

Expand Down Expand Up @@ -1311,12 +1315,16 @@ END OF TERMS AND CONDITIONS


== Copyright
Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
Copyright (c) 2013 The Go Authors. All rights reserved.
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2016, 2023 Oracle and/or its affiliates.
Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
Copyright © 2012-2020 Mat Ryer, Tyler Bunnell and contributors.
Copyright © 2013 The Go Authors. All rights reserved.

== Notices
Copyright (c) 2016, 2018, 2020, Oracle and/or its affiliates.
Expand Down Expand Up @@ -1770,6 +1778,7 @@ go.uber.org/zap
SPDX:MIT

== Copyright
Copyright (c) "*" Uber Technologies, Inc.")
Copyright (c) 2016 Uber Technologies, Inc.
Copyright (c) 2016, 2017 Uber Technologies, Inc.
Copyright (c) 2016-2017 Uber Technologies, Inc.
Expand Down Expand Up @@ -4242,5 +4251,5 @@ the Mozilla Public License, v. 2.0.


=== ATTRIBUTION-HELPER-GENERATED:
=== Attribution helper version: {Major:0 Minor:11 GitVersion:0.10.0-114-g3747dab9 GitCommit:3747dab92eb29c0dbe6409ffbb824b9ae3a04b87 GitTreeState:dirty BuildDate:2024-02-28T16:52:52Z GoVersion:go1.21.0 Compiler:gc Platform:darwin/amd64}
=== License file based on go.mod with md5 sum: 14c2ab8049fc7f49372d85182845f8d1
=== Attribution helper version: {Major:0 Minor:11 GitVersion: GitCommit: GitTreeState:dirty BuildDate:1970-01-01T00:00:00Z GoVersion:go1.19.3 Compiler:gc Platform:darwin/arm64}
=== License file based on go.mod with md5 sum: cfaca8bb69c36cdf198d538fbab61dee
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
path: /etc/kubernetes
containers:
- name: oci-cloud-controller-manager
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.30.1
image: ghcr.io/oracle/cloud-provider-oci:v1.30.1
command: ["/usr/local/bin/oci-cloud-controller-manager"]
args:
- --cloud-config=/etc/oci/cloud-provider.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.30.1
image: ghcr.io/oracle/cloud-provider-oci:v1.30.1
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.30.1
image: ghcr.io/oracle/cloud-provider-oci:v1.30.1
securityContext:
privileged: true
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions manifests/flexvolume-driver/oci-flexvolume-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
secretName: oci-flexvolume-driver
containers:
- name: oci-flexvolume-driver
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.30.1
image: ghcr.io/oracle/cloud-provider-oci:v1.30.1
command: ["/usr/local/bin/install.py", "-c", "/tmp/config.yaml"]
securityContext:
privileged: true
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
type: DirectoryOrCreate
containers:
- name: oci-flexvolume-driver
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.30.1
image: ghcr.io/oracle/cloud-provider-oci:v1.30.1
command: ["/usr/local/bin/install.py"]
securityContext:
privileged: true
Expand Down
59 changes: 18 additions & 41 deletions manifests/provider-config-example.yaml
Original file line number Diff line number Diff line change
@@ -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-----
<snip>
-----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:
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
secretName: oci-volume-provisioner
containers:
- name: oci-volume-provisioner
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.30.1
image: ghcr.io/oracle/cloud-provider-oci:v1.30.1
command: ["/usr/local/bin/oci-volume-provisioner"]
env:
- name: NODE_NAME
Expand Down
2 changes: 1 addition & 1 deletion manifests/volume-provisioner/oci-volume-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
secretName: oci-volume-provisioner
containers:
- name: oci-volume-provisioner
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.30.1
image: ghcr.io/oracle/cloud-provider-oci:v1.30.1
command: ["/usr/local/bin/oci-volume-provisioner"]
env:
- name: NODE_NAME
Expand Down

0 comments on commit 4a6b948

Please sign in to comment.