Third Party Licence and Cleanup unwanted changes

oracle · Oct 9, 2023 · 2e1b663 · 2e1b663
1 parent 83f4085
commit 2e1b663
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 26 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -26,7 +26,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
 
       - name: Build Image
-        run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image
+        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
 
       - name: Push Image
-        run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all
+        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt
@@ -6,12 +6,15 @@ SPDX:Apache-2.0
 ---------------------------------- Copyright -----------------------------------
 Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 Copyright 2014 The Kubernetes Authors.
+Copyright 2016 The Kubernetes Authors.
 Copyright 2017 Oracle and/or its affiliates. All rights reserved.
 Copyright 2017 The Kubernetes Authors.
 Copyright 2018 Oracle and/or its affiliates. All rights reserved.
 Copyright 2019 Oracle and/or its affiliates. All rights reserved.
 Copyright 2020 Oracle and/or its affiliates. All rights reserved.
 Copyright 2021 Oracle and/or its affiliates. All rights reserved.
+Copyright 2022 Oracle and/or its affiliates. All rights reserved.
+Copyright 2023 Oracle and/or its affiliates. All rights reserved.
 
 -------------------------- Fourth Party Dependencies ---------------------------
 
@@ -3902,4 +3905,4 @@ the Mozilla Public License, v. 2.0.
 
 === ATTRIBUTION-HELPER-GENERATED:
 === 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:  44a3b09805c5f60c83e1b48d2c1b752f
+=== License file based on go.mod with md5 sum:  e957b8b0f5b20080cd769d0650a881eb
diff --git a/hack/existing-standalone-cluster-env-template.sh b/hack/existing-standalone-cluster-env-template.sh
@@ -14,45 +14,41 @@
 ##################################################################################################
 
 # The test suites to run (can replace or add tags)
-export FOCUS="\[ccm\]"
-
-#Architecture to run tests on
-export ARCHITECTURE_AMD="AMD"
-export ARCHITECTURE_ARM="ARM"
+export FOCUS="\[cloudprovider\]"
 
 # Scope can be ARM / AMD / BOTH
 # Mandatory
-export SCOPE="AMD"
+export SCOPE="BOTH"
 
 # A Reserved IP in your compartment for testing LB creation with Reserved IP
 # Create a public reserved IP in your compartment using the following link:
 # https://docs.oracle.com/en-us/iaas/Content/Network/Tasks/managingpublicIPs.htm#console-reserved
 # Set the public reserved IP in the following env-variable:
 # Mandatory
-export RESERVED_IP="169.155.149.109"
+export RESERVED_IP=""
 
 # Set path to kubeconfig of existing cluster if it does not exist in default path. Defaults to $HOME/.kube/config.
 # Mandatory
-export CLUSTER_KUBECONFIG=/Users/ypgohoka/.e2e_ccm_csi/oss-testing-1.kubeconfig
+export CLUSTER_KUBECONFIG=$HOME/.kube/config
 
 # Set path to cloud_config of existing cluster if it does not exist in default path. Defaults to $HOME/cloudconfig.
 # Mandatory
-export CLOUD_CONFIG=/Users/ypgohoka/go/src/github.com/oracle/oci-cloud-controller-manager/hack/provider-config-example.yaml
+export CLOUD_CONFIG=$HOME/cloudconfig
 
 # ADLOCATION example is IqDk:US-ASHBURN-AD-1
 # Mandatory
-export ADLOCATION="Ddfp:US-ASHBURN-AD-2"
+export ADLOCATION=""
 
 # KMS key for CMEK testing
 # CMEK KEY example "ocid1.key.relm.region.bb..cc.aaa...aa"
 # Mandatory
-export CMEK_KMS_KEY="ocid1.key.oc1.iad.b5r7iu5xaagy2.abuwcljsizwczmdfnitnxaruykluz3p6kwprasd2l7ebfvbkxbytvuumg4cq"
+export CMEK_KMS_KEY=""
 
 # NSG Network security group created in cluster's VCN
 # CCM E2E tests require two NSGs to run successfully. Please create two NSGs in the cluster's VCN and set NSG_OCIDS
 # NSG_OCIDS example ocid1.networksecuritygroup.relm.region.aa...aa,ocid1.networksecuritygroup.relm.region.aa...aa
 # Mandatory
-export NSG_OCIDS="ocid1.networksecuritygroup.oc1.iad.aaaaaaaadmbnpdgorxe26epwelmapmxmooiouq5p65jkpeut5tamrovfh2va,ocid1.networksecuritygroup.oc1.iad.aaaaaaaaietpqjjzct2aehnoyvqyc4g5zfcpe52givqgew3bzmubrgcqbuyq"
+export NSG_OCIDS=""
 
 # FSS VOLUME HANDLE in the format filesystem_ocid:mountTargetIP:export_path
 # Make sure fss volume handle is in the same subnet as your nodes
@@ -61,7 +57,7 @@ export NSG_OCIDS="ocid1.networksecuritygroup.oc1.iad.aaaaaaaadmbnpdgorxe26epwelm
 # And setup your network for the file system by following:
 # https://docs.oracle.com/en-us/iaas/Content/File/Tasks/securitylistsfilestorage.htm
 # Mandatory
-export FSS_VOLUME_HANDLE="ocid1.filesystem.oc1.iad.aaaaaaaaaacdndlxnfqwillqojxwiotjmfsc2ylefuyqaaaa:10.0.73.199:/oss-test"
+export FSS_VOLUME_HANDLE=""
 
 # For debugging the tests in existing cluster, do not turn it off by default.
 # Optional
@@ -71,6 +67,8 @@ export FSS_VOLUME_HANDLE="ocid1.filesystem.oc1.iad.aaaaaaaaaacdndlxnfqwillqojxwi
 # Optional
 # export IMAGE_PULL_REPO="accessiblerepo.com/repo/path/"
 
-export MNT_TARGET_ID="ocid1.mounttarget.oc1.iad.aaaaacvippzjdfiynfqwillqojxwiotjmfsc2ylefuyqaaaa"
-export MNT_TARGET_SUBNET_ID="ocid1.subnet.oc1.iad.aaaaaaaafujcpvwdn3s2liqwrilolm7jmxkwq35zieo7zk4medjtqxjac7cq"
-export MNT_TARGET_COMPARTMENT_ID="ocid1.compartment.oc1..aaaaaaaaee2fxlf36idmiqlyvnyhkh2oquz5loogbmzat73hnnqhu2c3352a"
+export MNT_TARGET_ID=""
+export MNT_TARGET_SUBNET_ID=""
+export MNT_TARGET_COMPARTMENT_ID=""
+
+export STATIC_SNAPSHOT_COMPARTMENT_ID=""
diff --git 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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.1
           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
@@ -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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.1
           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
@@ -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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.1
           securityContext:
             privileged: true
           volumeMounts:

diff --git 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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.1
           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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.1
           command: ["/usr/local/bin/install.py"]
           securityContext:
             privileged: true

diff --git 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.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.1
           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
@@ -35,7 +35,7 @@ spec:
             secretName: oci-volume-provisioner
       containers:
         - name: oci-volume-provisioner
-          image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.1
           command: ["/usr/local/bin/oci-volume-provisioner"]
           env:
             - name: NODE_NAME