update unbounded cni to v0.7.0

cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/01-configmap.yaml → cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/01-configmap.yaml

@@ -53,4 +53,3 @@ data:
       statusPushDelta: true
       statusPushInterval: "10s"
       statusPushApiserverInterval: "20s"
-      frrVtyshPath: "/frr/bin/vtysh"

cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/03-deployment.yaml → cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/03-deployment.yaml

@@ -68,7 +68,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: controller
-          image: unboundedcnitme.azurecr.io/unbounded-cni-controller:v0.5.3
+          image: unboundedcnitme.azurecr.io/unbounded-cni-controller:v0.7.0
           imagePullPolicy: Always
           volumeMounts:
             - name: tmp

cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/03-daemonset.yaml → cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/node/03-daemonset.yaml

@@ -22,9 +22,6 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9998"
         prometheus.io/path: "/metrics"
-        prometheus.io/scrape-frr: "true"
-        prometheus.io/port-frr: "9342"
-        prometheus.io/path-frr: "/metrics"
       labels:
         app.kubernetes.io/name: unbounded-cni-node
         app.kubernetes.io/component: node
@@ -40,7 +37,7 @@ spec:
       initContainers:
         # Install CNI plugins to host
         - name: install-cni-plugins
-          image: unboundedcnitme.azurecr.io/unbounded-cni-node:v0.5.3
+          image: unboundedcnitme.azurecr.io/unbounded-cni-node:v0.7.0
           imagePullPolicy: Always
           command:
             - /usr/local/bin/node-agent-init.sh
@@ -53,7 +50,7 @@ spec:
             privileged: true
       containers:
         - name: node
-          image: unboundedcnitme.azurecr.io/unbounded-cni-node:v0.5.3
+          image: unboundedcnitme.azurecr.io/unbounded-cni-node:v0.7.0
           imagePullPolicy: Always
           env:
             - name: LOG_LEVEL
@@ -87,13 +84,6 @@ spec:
               mountPath: /tmp
             - name: vartmp
               mountPath: /var/tmp
-            - name: frr-config
-              mountPath: /frr/etc/frr
-              readOnly: true
-            - name: frr-run
-              mountPath: /var/run/frr
-            - name: frr-lib
-              mountPath: /var/lib/frr
             - name: runtime-config
               mountPath: /etc/unbounded-cni/config.yaml
               subPath: config.yaml
@@ -124,85 +114,6 @@ spec:
             initialDelaySeconds: 5
             periodSeconds: 5
             timeoutSeconds: 5
-        - name: frr
-          image: unboundedcnitme.azurecr.io/unbounded-cni-node:v0.5.3
-          imagePullPolicy: Always
-          command:
-            - /usr/local/bin/start-frr.sh
-          volumeMounts:
-            - name: frr-config
-              mountPath: /frr/etc/frr
-              readOnly: true
-            - name: frr-run
-              mountPath: /var/run/frr
-            - name: frr-lib
-              mountPath: /var/lib/frr
-            - name: tmp
-              mountPath: /tmp
-            - name: vartmp
-              mountPath: /var/tmp
-          resources:
-            requests:
-              cpu: 10m
-              memory: 32Mi
-            limits:
-              cpu: 100m
-              memory: 64Mi
-          livenessProbe:
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                - /frr/bin/vtysh -c "show mgmt datastore" >/dev/null 2>&1
-            initialDelaySeconds: 10
-            periodSeconds: 15
-            timeoutSeconds: 5
-          securityContext:
-            allowPrivilegeEscalation: true
-            readOnlyRootFilesystem: true
-            runAsUser: 0
-            privileged: true
-        - name: frr-exporter
-          image: unboundedcnitme.azurecr.io/unbounded-cni-node:v0.5.3
-          imagePullPolicy: Always
-          command:
-            - /usr/local/bin/frr_exporter
-          args:
-            - --frr.socket.dir-path=/var/run/frr
-            - --no-collector.bgp
-            - --no-collector.ospf
-            - --no-collector.pim
-            - --no-collector.vrrp
-            - --collector.bfd
-            - --collector.route
-          ports:
-            - name: frr-metrics
-              containerPort: 9342
-              protocol: TCP
-          volumeMounts:
-            - name: frr-run
-              mountPath: /var/run/frr
-              readOnly: true
-          resources:
-            requests:
-              cpu: 5m
-              memory: 16Mi
-            limits:
-              cpu: 50m
-              memory: 32Mi
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: frr-metrics
-            initialDelaySeconds: 15
-            periodSeconds: 30
-            timeoutSeconds: 5
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            runAsNonRoot: true
-            runAsUser: 999
-            runAsGroup: 998
       volumes:
         - name: cni-bin
           hostPath:
@@ -224,15 +135,6 @@ spec:
           emptyDir: {}
         - name: vartmp
           emptyDir: {}
-        - name: frr-config
-          configMap:
-            name: unbounded-cni-frr-config
-            defaultMode: 0644
-            optional: true
-        - name: frr-run
-          emptyDir: {}
-        - name: frr-lib
-          emptyDir: {}
         - name: runtime-config
           configMap:
             name: unbounded-cni-config

cli/internal/aks/deploy/unboundedcni/unboundedcni.go

@@ -15,7 +15,7 @@ import (
 //go:embed assets/*
 var assets embed.FS
 
-const bundledFolder = "unbounded-cni-0.5.3"
+const bundledFolder = "unbounded-cni"
 
 func Preflight() error {
 	// check for kubectl