diff --git a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml index 8b95430ace..2e3ac7d657 100644 --- a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml +++ b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml @@ -67,7 +67,6 @@ stages: kubectl get po -owide -A echo "deploy Cilium ConfigMap" - kubectl apply -f cilium/configmap.yaml kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml echo "install Cilium onto Overlay Cluster" kubectl apply -f test/integration/manifests/cilium/cilium-agent diff --git a/.pipelines/cni/cilium/cilium-scale-test.yaml b/.pipelines/cni/cilium/cilium-scale-test.yaml index 8ff45b570d..45a17da9d2 100644 --- a/.pipelines/cni/cilium/cilium-scale-test.yaml +++ b/.pipelines/cni/cilium/cilium-scale-test.yaml @@ -19,7 +19,6 @@ stages: az aks get-credentials --resource-group ${CLUSTER} --name ${CLUSTER} echo "Redeploy all cilium components and update cilium version. Redeploy all to catch all changes between versions" echo "deploy Cilium ConfigMap" - kubectl apply -f cilium/configmap.yaml kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml echo "install Cilium ${CILIUM_VERSION_TAG}" envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f - diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml index 88346909fb..bf38ae9266 100644 --- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml @@ -42,7 +42,6 @@ steps: kubectl get po -owide -A if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then FILE_PATH=-nightly && echo "Running nightly"; fi echo "deploy Cilium ConfigMap" - kubectl apply -f cilium/configmap.yaml kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-config.yaml echo "install Cilium ${CILIUM_VERSION_TAG}" # Passes Cilium image to daemonset and deployment diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index d57aa0af3e..2565fa8fd3 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -40,7 +40,6 @@ steps: kubectl cluster-info kubectl get po -owide -A echo "deploy Cilium ConfigMap" - kubectl apply -f cilium/configmap.yaml kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml echo "install Cilium ${CILIUM_VERSION_TAG}" envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f - diff --git a/cilium/cilium_helm_values.yaml b/cilium/cilium_helm_values.yaml deleted file mode 100644 index 08711b777d..0000000000 --- a/cilium/cilium_helm_values.yaml +++ /dev/null @@ -1,41 +0,0 @@ -image: - repository: mcr.microsoft.com/oss/cilium/cilium - tag: 1.12.10 - digest: "" - useDigest: false - -operator: - image: - repository: mcr.microsoft.com/oss/cilium/operator - tag: 1.12.10 - suffix: "" - digest: "" - useDigest: false - -ipam: - mode: "delegated-plugin" - -tunnel: disabled - -endpointRoutes: - enabled: true - -extraArgs: - - --local-router-ipv4=169.254.23.0 - -# kubenet pod CIDR -ipv4NativeRoutingCIDR: 10.241.0.0/16 -enableIPv4Masquerade: false -install-no-conntrack-iptables-rules: false -installIptablesRules: true -l7Proxy: false -hubble: - enabled: false -kubeProxyReplacement: strict - -endpointHealthChecking: - enabled: false - -cni: - install: true - customConf: true diff --git a/cilium/configmap.yaml b/cilium/configmap.yaml deleted file mode 100644 index cfd29270af..0000000000 --- a/cilium/configmap.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: cni-configuration - namespace: kube-system -data: - cni-config: |- - { - "cniVersion": "0.3.1", - "name": "cilium", - "plugins": [ - { - "type": "cilium-cni", - "ipam": { - "type": "azure-ipam" - }, - "enable-debug": true, - "log-file": "/var/log/cilium-cni.log" - } - ] - }