OKE-27032 Flannel Support (#28)

* Added Flannel Support * Added cluster cni check
oracle · Nov 7, 2023 · 642ca75 · 642ca75
1 parent 08494ac
commit 642ca75
Show file tree

Hide file tree

Showing 168 changed files with 15,633 additions and 570 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/GettingStarted.md b/GettingStarted.md
@@ -118,6 +118,7 @@ Allow <subject> to read certificate-authority-bundles in compartment <compartmen
 ALLOW <subject> native-ingress-controller to read public-ips in tenancy
 ALLOW <subject> native-ingress-controller to manage floating-ips in tenancy 
 Allow <subject> to manage waf-family in compartment <compartment-id>
+Allow <subject> to read cluster-family in compartment <compartment-id>
 
 Policy scope can be broadened to Tenancy or restricted to a particular location as shown below:
 allow <subject> to manage load-balancers in tenancy

diff --git a/deploy/manifests/oci-native-ingress-controller/templates/deployment.yaml b/deploy/manifests/oci-native-ingress-controller/templates/deployment.yaml
@@ -18,10 +18,10 @@ metadata:
   name: oci-native-ingress-controller
   namespace: native-ingress-controller-system
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -51,7 +51,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "ghcr.io/oracle/oci-native-ingress-controller:v1.2.0"
+          image: "ghcr.io/oracle/oci-native-ingress-controller:v1.3.0"
           imagePullPolicy: Always
           args: 
           - --lease-lock-name=oci-native-ingress-controller
@@ -61,14 +61,15 @@ spec:
           - --controller-class=oci.oraclecloud.com/native-ingress-controller
           - --compartment-id=
           - --subnet-id=
+          - --cluster-id=
           - --metrics-backend=prometheus
           - --metrics-port=2223
           - --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/deploy/manifests/oci-native-ingress-controller/templates/rbac.yaml b/deploy/manifests/oci-native-ingress-controller/templates/rbac.yaml
@@ -11,10 +11,10 @@ kind: ClusterRole
 metadata:
   name: oci-native-ingress-controller-role
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups: [""]
@@ -48,10 +48,10 @@ kind: ClusterRoleBinding
 metadata:
   name: oci-native-ingress-controller-rolebinding
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -69,10 +69,10 @@ metadata:
   name: oci-native-ingress-controller-leader-election-role
   namespace: native-ingress-controller-system
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups: ["coordination.k8s.io"]
@@ -90,10 +90,10 @@ metadata:
   name: oci-native-ingress-controller-leader-election-rolebinding
   namespace: native-ingress-controller-system
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/deploy/manifests/oci-native-ingress-controller/templates/service.yaml b/deploy/manifests/oci-native-ingress-controller/templates/service.yaml
@@ -12,10 +12,10 @@ metadata:
   name: oci-native-ingress-controller
   namespace: native-ingress-controller-system
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP

diff --git a/deploy/manifests/oci-native-ingress-controller/templates/serviceaccount.yaml b/deploy/manifests/oci-native-ingress-controller/templates/serviceaccount.yaml
@@ -12,8 +12,8 @@ metadata:
   name: oci-native-ingress-controller
   namespace: native-ingress-controller-system
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
diff --git a/deploy/manifests/oci-native-ingress-controller/templates/webhook.yaml b/deploy/manifests/oci-native-ingress-controller/templates/webhook.yaml
@@ -36,10 +36,10 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: oci-native-ingress-controller-webhook
   labels:
-    helm.sh/chart: oci-native-ingress-controller-1.2.0
+    helm.sh/chart: oci-native-ingress-controller-1.3.0
     app.kubernetes.io/name: oci-native-ingress-controller
     app.kubernetes.io/instance: oci-native-ingress-controller
-    app.kubernetes.io/version: "1.2.0"
+    app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
     cert-manager.io/inject-ca-from: native-ingress-controller-system/oci-native-ingress-controller-webhook-serving-cert

diff --git a/helm/oci-native-ingress-controller/Chart.yaml b/helm/oci-native-ingress-controller/Chart.yaml
@@ -8,8 +8,8 @@ apiVersion: v2
 name: oci-native-ingress-controller
 description: OCI Native Ingress Controller
 type: application
-version: 1.2.0
-appVersion: "1.2.0"
+version: 1.3.0
+appVersion: "1.3.0"
 
 maintainers:
   - name: OKE Foundations team

diff --git a/helm/oci-native-ingress-controller/templates/deployment.yaml b/helm/oci-native-ingress-controller/templates/deployment.yaml
@@ -61,14 +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}}
           - --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
@@ -21,7 +22,7 @@ image:
   repository: ghcr.io/oracle/oci-native-ingress-controller
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v1.2.0"
+  tag: "v1.3.0"
 
 imagePullSecrets: []
 nameOverride: ""