Added cluster cni check

oracle · Nov 6, 2023 · 81bf8bc · 81bf8bc
1 parent 752a4f1
commit 81bf8bc
Show file tree

Hide file tree

Showing 155 changed files with 14,499 additions and 477 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,8 +7,8 @@
 name: Unit Tests
 
 on:
-  pull_request: {}
-  push: {}
+  pull_request: { }
+  push: { }
 jobs:
   build:
     name: Build
@@ -30,7 +30,7 @@ jobs:
 
       - name: Run Unit Tests
         run: |
-          go test -covermode=count -coverprofile=profile.cov ./pkg/...
+          go test -covermode=count -coverprofile=profile.cov  $(go list ./pkg/... | grep -v /server | grep -v /testutil)
       - name: Send coverage
         env:
           COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/deploy/manifests/oci-native-ingress-controller/templates/deployment.yaml b/deploy/manifests/oci-native-ingress-controller/templates/deployment.yaml
@@ -61,15 +61,15 @@ spec:
           - --controller-class=oci.oraclecloud.com/native-ingress-controller
           - --compartment-id=
           - --subnet-id=
+          - --cluster-id=
           - --metrics-backend=prometheus
           - --metrics-port=2223
-          - --cniType=OCI_VCN_IP_NATIVE
           - --v=4
           env:
             - name: OCI_RESOURCE_PRINCIPAL_VERSION
               value: "2.2"
             - name: OCI_RESOURCE_PRINCIPAL_REGION
-              value: "us-ashburn-1"
+              value: "us-phoenix-1"
             - name: OCI_SDK_DEFAULT_RETRY_ENABLED
               value: "true"
           ports:

diff --git a/helm/oci-native-ingress-controller/templates/deployment.yaml b/helm/oci-native-ingress-controller/templates/deployment.yaml
@@ -61,15 +61,15 @@ spec:
           - --controller-class={{ .Values.controller_class }}
           - --compartment-id={{ .Values.compartment_id }}
           - --subnet-id={{ .Values.subnet_id }}
+          - --cluster-id={{.Values.cluster_id }}
           - --metrics-backend={{.Values.metrics.backend}}
           - --metrics-port={{.Values.metrics.port}}
-          - --cniType={{.Values.cniType}}
           - --v=4
           env:
             - name: OCI_RESOURCE_PRINCIPAL_VERSION
               value: "2.2"
             - name: OCI_RESOURCE_PRINCIPAL_REGION
-              value: "us-ashburn-1"
+              value: "us-phoenix-1"
             - name: OCI_SDK_DEFAULT_RETRY_ENABLED
               value: "true"
           ports:

diff --git a/helm/oci-native-ingress-controller/values.yaml b/helm/oci-native-ingress-controller/values.yaml
@@ -13,6 +13,7 @@ controller_class: oci.oraclecloud.com/native-ingress-controller
 lease_lock_name: oci-native-ingress-controller
 compartment_id: ""
 subnet_id: ""
+cluster_id: ""
 
 deploymentNamespace : native-ingress-controller-system
 replicaCount: 1
@@ -110,7 +111,3 @@ objectSelector:
 metrics:
   backend: prometheus
   port: 2223
-
-
-# Supported CNI : OCI_VCN_IP_NATIVE, FLANNEL_OVERLAY
-cniType: OCI_VCN_IP_NATIVE