manifest and workflow changes

oracle · Oct 4, 2023 · 83f4085 · 83f4085
1 parent 149c88a
commit 83f4085
Show file tree

Hide file tree

Showing 287 changed files with 28,647 additions and 30 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/oracle" VERSION="${{ github.ref_name }}" make image
+        run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image
 
       - name: Push Image
-        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
+        run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all
diff --git a/hack/existing-standalone-cluster-env-template.sh b/hack/existing-standalone-cluster-env-template.sh
@@ -14,41 +14,45 @@
 ##################################################################################################
 
 # The test suites to run (can replace or add tags)
-export FOCUS="\[cloudprovider\]"
+export FOCUS="\[ccm\]"
+
+#Architecture to run tests on
+export ARCHITECTURE_AMD="AMD"
+export ARCHITECTURE_ARM="ARM"
 
 # Scope can be ARM / AMD / BOTH
 # Mandatory
-export SCOPE="BOTH"
+export SCOPE="AMD"
 
 # 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=""
+export RESERVED_IP="169.155.149.109"
 
 # Set path to kubeconfig of existing cluster if it does not exist in default path. Defaults to $HOME/.kube/config.
 # Mandatory
-export CLUSTER_KUBECONFIG=$HOME/.kube/config
+export CLUSTER_KUBECONFIG=/Users/ypgohoka/.e2e_ccm_csi/oss-testing-1.kubeconfig
 
 # Set path to cloud_config of existing cluster if it does not exist in default path. Defaults to $HOME/cloudconfig.
 # Mandatory
-export CLOUD_CONFIG=$HOME/cloudconfig
+export CLOUD_CONFIG=/Users/ypgohoka/go/src/github.com/oracle/oci-cloud-controller-manager/hack/provider-config-example.yaml
 
 # ADLOCATION example is IqDk:US-ASHBURN-AD-1
 # Mandatory
-export ADLOCATION=""
+export ADLOCATION="Ddfp:US-ASHBURN-AD-2"
 
 # KMS key for CMEK testing
 # CMEK KEY example "ocid1.key.relm.region.bb..cc.aaa...aa"
 # Mandatory
-export CMEK_KMS_KEY=""
+export CMEK_KMS_KEY="ocid1.key.oc1.iad.b5r7iu5xaagy2.abuwcljsizwczmdfnitnxaruykluz3p6kwprasd2l7ebfvbkxbytvuumg4cq"
 
 # 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=""
+export NSG_OCIDS="ocid1.networksecuritygroup.oc1.iad.aaaaaaaadmbnpdgorxe26epwelmapmxmooiouq5p65jkpeut5tamrovfh2va,ocid1.networksecuritygroup.oc1.iad.aaaaaaaaietpqjjzct2aehnoyvqyc4g5zfcpe52givqgew3bzmubrgcqbuyq"
 
 # FSS VOLUME HANDLE in the format filesystem_ocid:mountTargetIP:export_path
 # Make sure fss volume handle is in the same subnet as your nodes
@@ -57,7 +61,7 @@ export NSG_OCIDS=""
 # 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=""
+export FSS_VOLUME_HANDLE="ocid1.filesystem.oc1.iad.aaaaaaaaaacdndlxnfqwillqojxwiotjmfsc2ylefuyqaaaa:10.0.73.199:/oss-test"
 
 # For debugging the tests in existing cluster, do not turn it off by default.
 # Optional
@@ -67,8 +71,6 @@ export FSS_VOLUME_HANDLE=""
 # Optional
 # export IMAGE_PULL_REPO="accessiblerepo.com/repo/path/"
 
-export MNT_TARGET_ID=""
-export MNT_TARGET_SUBNET_ID=""
-export MNT_TARGET_COMPARTMENT_ID=""
-
-export STATIC_SNAPSHOT_COMPARTMENT_ID=""
+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"
diff --git a/hack/run_e2e_test.sh b/hack/run_e2e_test.sh
@@ -29,7 +29,6 @@ check-env "FSS_VOLUME_HANDLE"       $FSS_VOLUME_HANDLE
 check-env "MNT_TARGET_ID"             $MNT_TARGET_ID
 check-env "MNT_TARGET_SUBNET_ID"      $MNT_TARGET_SUBNET_ID
 check-env "MNT_TARGET_COMPARTMENT_ID" $MNT_TARGET_COMPARTMENT_ID
-check-env "CLUSTER_TYPE"              $CLUSTER_TYPE
 
 function set_image_pull_repo_and_delete_namespace_flag () {
     if [ -z "$IMAGE_PULL_REPO" ]; then
@@ -56,7 +55,6 @@ function run_e2e_tests_existing_cluster() {
         --architecture=${ARCHITECTURE} \
         --volume-handle=${FSS_VOLUME_HANDLE} \
         --static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID}
-        --cluster-type=${CLUSTER_TYPE}
     retval=$?
     return $retval
 }
@@ -97,7 +95,6 @@ echo "CLOUD_CONFIG is ${CLOUD_CONFIG}"
 echo "MNT_TARGET_ID is ${MNT_TARGET_ID}"
 echo "MNT_TARGET_SUBNET_ID is ${MNT_TARGET_SUBNET_ID}"
 echo "MNT_TARGET_COMPARTMENT_ID is ${MNT_TARGET_COMPARTMENT_ID}"
-echo "CLUSTER_TYPE is ${CLUSTER_TYPE}"
 
 function run_tests () {
     set_image_pull_repo_and_delete_namespace_flag

diff --git a/manifests/cloud-controller-manager/oci-cloud-controller-manager-rbac.yaml b/manifests/cloud-controller-manager/oci-cloud-controller-manager-rbac.yaml
@@ -34,6 +34,7 @@ rules:
   - list
   - watch
   - patch
+  - get
 
 - apiGroups:
   - ""
@@ -130,6 +131,9 @@ rules:
   - serviceaccounts
   verbs:
   - create
+  - list
+  - get
+  - watch
 - apiGroups:
   - ""
   resources:

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/oracle/cloud-provider-oci:latest
+          image: ghcr.io/yashwantgohokar/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
@@ -52,7 +52,7 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-attacher
-          image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.2.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --timeout=120s
@@ -65,7 +65,7 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-resizer
-          image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.7.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --leader-election
@@ -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/oracle/cloud-provider-oci:latest
+          image: ghcr.io/yashwantgohokar/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/oracle/cloud-provider-oci:latest
+          image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
           securityContext:
             privileged: true
           volumeMounts:
@@ -151,7 +151,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/blockvolume.csi.oraclecloud.com/csi.sock
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
           securityContext:
             privileged: true
           lifecycle:
@@ -170,7 +170,7 @@ spec:
           args:
             - --csi-address=/fss/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/fss.csi.oraclecloud.com/csi.sock
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
           securityContext:
             privileged: true
           lifecycle:

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/oracle/cloud-provider-oci:latest
+          image: ghcr.io/yashwantgohokar/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/oracle/cloud-provider-oci:latest
+          image: ghcr.io/yashwantgohokar/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/oracle/cloud-provider-oci:latest
+          image: ghcr.io/yashwantgohokar/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/oracle/cloud-provider-oci:latest
+          image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
           command: ["/usr/local/bin/oci-volume-provisioner"]
           env:
             - name: NODE_NAME

diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/core/compute_instance_options.go b/vendor/github.com/oracle/oci-go-sdk/v65/core/compute_instance_options.go
diff --git a/...oracle/oci-go-sdk/v65/core/instance_configuration_instance_source_image_filter_details.go b/...oracle/oci-go-sdk/v65/core/instance_configuration_instance_source_image_filter_details.go
diff --git a/.../oci-go-sdk/v65/core/instance_configuration_ipv6_address_ipv6_subnet_cidr_pair_details.go b/.../oci-go-sdk/v65/core/instance_configuration_ipv6_address_ipv6_subnet_cidr_pair_details.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ rules: @@
       - list
       - watch
       - patch
+      - get
     - apiGroups:
       - ""
@@ Expand Down Expand Up / @@ -130,6 +131,9 @@ rules: @@
       - serviceaccounts
       verbs:
       - create
+      - list
+      - get
+      - watch
     - apiGroups:
       - ""
       resources:
@@ Expand Down @@