fix(platform): remove cilium configmap (#1528)

build/docker/tools/provider-res/Dockerfile

@@ -36,4 +36,6 @@ COPY linux-amd64/NVIDIA-*.tar.gz       res/linux-amd64/
 
 COPY linux-amd64/nvidia-container-*.tar.gz res/linux-amd64/
 
+COPY cilium* res/cilium/
+
 ENTRYPOINT ["sh"]

build/docker/tools/provider-res/Makefile

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations under the License.
 
 IMAGE = provider-res
-VERSION = v1.20.4-1
+VERSION = v1.20.4-2
 REGISTRY_PREFIX ?= tkestack
 
 COMMON_SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
@@ -34,6 +34,7 @@ include $(ROOT_DIR)/build/lib/docker-buildx.mk
 .PHONY: per.build
 per.build: download
 	@cp "$(ROOT_DIR)/build/docker/tools/$(IMAGE)/Dockerfile" "$(WORK_DIR)/Dockerfile"
+	@cp -r "$(ROOT_DIR)/pkg/platform/provider/baremetal/manifests/cilium" "$(WORK_DIR)/cilium"
 
 .PHONY: download
 download:
@@ -64,7 +65,7 @@ manifest.multiarch: per.build
 	#@rm -rf "$(WORK_DIR)"
 	@echo "===========> Pushing manifest $(REGISTRY_PREFIX)/$(IMAGE):$(VERSION) and then remove the local manifest list"
 	REGISTRY_PREFIX=$(REGISTRY_PREFIX) PLATFROMS="$(PLATFORMS)" IMAGE=$(IMAGE) VERSION=$(VERSION) \
-	  DOCKER_CLI_EXPERIMENTAL=enabled $(ROOT_DIR)/build/lib/create-manifest.sh 
+	  DOCKER_CLI_EXPERIMENTAL=enabled $(ROOT_DIR)/build/lib/create-manifest.sh
 
 ## help: Show this help info.
 .PHONY: help

build/docker/tools/tke-installer/release.sh

@@ -23,7 +23,7 @@ set -o pipefail
 REGISTRY_PREFIX=${REGISTRY_PREFIX:-tkestack}
 BUILDER=${BUILDER:-default}
 VERSION=${VERSION:-$(git describe --dirty --always --tags | sed 's/-/./g')}
-PROVIDER_RES_VERSION=v1.20.4-1
+PROVIDER_RES_VERSION=v1.20.4-2
 K8S_VERSION=${PROVIDER_RES_VERSION%-*}
 DOCKER_VERSION=19.03.14
 OSS=(linux)

cmd/tke-installer/app/installer/images/images.go

@@ -76,7 +76,7 @@ var components = Components{
 	InfluxDB: containerregistry.Image{Name: "influxdb", Tag: "1.7.9"},
 	Thanos:   containerregistry.Image{Name: "thanos", Tag: "v0.15.0"},
 
-	ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.20.4-1"},
+	ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.20.4-2"},
 
 	TKEAuthAPI:               containerregistry.Image{Name: "tke-auth-api", Tag: Version},
 	TKEAuthController:        containerregistry.Image{Name: "tke-auth-controller", Tag: Version},

cmd/tke-installer/app/installer/manifests/tke-platform-api/tke-platform-api.yaml

@@ -66,8 +66,6 @@ spec:
               mountPath: /app/provider/baremetal/manifests/keepalived/
             - name: metrics-server-manifests-volume
               mountPath: /app/provider/baremetal/manifests/metrics-server/
-            - name: cilium-manifests-volume
-              mountPath: /app/provider/baremetal/manifests/cilium/
           ports:
             - containerPort: 9443
           readinessProbe:
@@ -127,9 +125,6 @@ spec:
         - name: metrics-server-manifests-volume
           configMap:
             name: metrics-server-manifests
-        - name: cilium-manifests-volume
-          configMap:
-            name: cilium-manifests
 ---
 kind: ConfigMap
 apiVersion: v1

cmd/tke-installer/app/installer/manifests/tke-platform-controller/tke-platform-controller.yaml

@@ -54,8 +54,6 @@ spec:
               mountPath: /app/provider/baremetal/manifests/keepalived/
             - name: metrics-server-manifests-volume
               mountPath: /app/provider/baremetal/manifests/metrics-server/
-            - name: cilium-manifests-volume
-              mountPath: /app/provider/baremetal/manifests/cilium/
           ports:
             - containerPort: 9445
           livenessProbe:
@@ -105,9 +103,6 @@ spec:
         - name: metrics-server-manifests-volume
           configMap:
             name: metrics-server-manifests
-        - name: cilium-manifests-volume
-          configMap:
-            name: cilium-manifests
 ---
 kind: ConfigMap
 apiVersion: v1

pkg/platform/provider/baremetal/constants/constants.go

@@ -118,7 +118,7 @@ const (
 	GPUManagerManifest    = ManifestsDir + "gpu-manager/gpu-manager.yaml"
 	CSIOperatorManifest   = ManifestsDir + "csi-operator/csi-operator.yaml"
 	MetricsServerManifest = ManifestsDir + "metrics-server/metrics-server.yaml"
-	CiliumManifest        = ManifestsDir + "cilium/*.yaml"
+	CiliumManifest        = SrcDir + "cilium/*.yaml"
 
 	KUBERNETES                   = 1
 	DNSIPIndex                   = 10