diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/00-frr-configmap.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/00-frr-configmap.yaml deleted file mode 100644 index 6bbc47b..0000000 --- a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/00-frr-configmap.yaml +++ /dev/null @@ -1,74 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: unbounded-cni-frr-config - namespace: unbounded-cni -data: - daemons: | - # Default FRR daemon settings for unbounded-cni. - # Enable only what the node agent requires. - - zebra=yes - mgmtd=yes - bfdd=yes - staticd=yes - - # These daemons are not built in the container image - bgpd=no - ospfd=no - ospf6d=no - ripd=no - ripngd=no - isisd=no - pimd=no - pim6d=no - nhrpd=no - eigrpd=no - babeld=no - sharpd=no - pbrd=no - fabricd=no - vrrpd=no - pathd=no - - # Watchfrr is enabled by default when available. - watchfrr=yes - watchfrr_options="--limit-fds 100000" - - # Additional options (left empty by default). - zebra_options="--limit-fds 100000 --log stdout --log-level info" - mgmtd_options="--limit-fds 100000 --log stdout --log-level info" - staticd_options="--limit-fds 100000 --log stdout --log-level info" - bfdd_options="--limit-fds 100000 --log stdout --log-level info" - - # These daemons are not built in the container image - # bgpd_options="--limit-fds 100000 --log stdout --log-level info" - # ospfd_options="--limit-fds 100000 --log stdout --log-level info" - # ospf6d_options="--limit-fds 100000 --log stdout --log-level info" - # ripd_options="--limit-fds 100000 --log stdout --log-level info" - # ripngd_options="--limit-fds 100000 --log stdout --log-level info" - # isisd_options="--limit-fds 100000 --log stdout --log-level info" - # pimd_options="--limit-fds 100000 --log stdout --log-level info" - # pim6d_options="--limit-fds 100000 --log stdout --log-level info" - # nhrpd_options="--limit-fds 100000 --log stdout --log-level info" - # eigrpd_options="--limit-fds 100000 --log stdout --log-level info" - # babeld_options="--limit-fds 100000 --log stdout --log-level info" - # sharpd_options="--limit-fds 100000 --log stdout --log-level info" - # pbrd_options="--limit-fds 100000 --log stdout --log-level info" - # fabricd_options="--limit-fds 100000 --log stdout --log-level info" - # vrrpd_options="--limit-fds 100000 --log stdout --log-level info" - # pathd_options="--limit-fds 100000 --log stdout --log-level info" - frr.conf: | - ! - ! Default FRR configuration for unbounded-cni. - ! - frr defaults traditional - hostname unbounded-cni - service integrated-vtysh-config - ! - mgmtd.conf: "" - staticd.conf: "" - vtysh.conf: | - service integrated-vtysh-config - zebra.conf: "" diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/00-namespace.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/00-namespace.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/00-namespace.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/00-namespace.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/01-configmap.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/01-configmap.yaml similarity index 97% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/01-configmap.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/01-configmap.yaml index abe9843..cce378b 100644 --- a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/01-configmap.yaml +++ b/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" diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/01-serviceaccount.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/01-serviceaccount.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/01-serviceaccount.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/01-serviceaccount.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/02-rbac.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/02-rbac.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/02-rbac.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/02-rbac.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/03-deployment.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/03-deployment.yaml similarity index 99% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/03-deployment.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/03-deployment.yaml index c31f765..ad600d1 100644 --- a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/03-deployment.yaml +++ b/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 diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/04-service.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/04-service.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/04-service.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/04-service.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/05-webhook.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/05-webhook.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/controller/05-webhook.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/controller/05-webhook.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/README.md b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/README.md similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/README.md rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/README.md diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_gatewaypoolnodes.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_gatewaypoolnodes.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_gatewaypoolnodes.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_gatewaypoolnodes.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_gatewaypoolpeerings.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_gatewaypoolpeerings.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_gatewaypoolpeerings.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_gatewaypoolpeerings.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_gatewaypools.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_gatewaypools.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_gatewaypools.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_gatewaypools.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sitegatewaypoolassignments.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sitegatewaypoolassignments.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sitegatewaypoolassignments.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sitegatewaypoolassignments.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sitenodeslices.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sitenodeslices.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sitenodeslices.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sitenodeslices.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sitepeerings.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sitepeerings.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sitepeerings.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sitepeerings.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sites.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sites.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/crds/unbounded.aks.azure.com_sites.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/crds/unbounded.aks.azure.com_sites.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/01-serviceaccount.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/node/01-serviceaccount.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/01-serviceaccount.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/node/01-serviceaccount.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/02-rbac.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/node/02-rbac.yaml similarity index 100% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/02-rbac.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/node/02-rbac.yaml diff --git a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/03-daemonset.yaml b/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/node/03-daemonset.yaml similarity index 58% rename from cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/03-daemonset.yaml rename to cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni/node/03-daemonset.yaml index 282af89..7f9d725 100644 --- a/cli/internal/aks/deploy/unboundedcni/assets/unbounded-cni-0.5.3/node/03-daemonset.yaml +++ b/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 diff --git a/cli/internal/aks/deploy/unboundedcni/unboundedcni.go b/cli/internal/aks/deploy/unboundedcni/unboundedcni.go index d9bddb9..c8cdfe5 100644 --- a/cli/internal/aks/deploy/unboundedcni/unboundedcni.go +++ b/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