fix(Makefile): Wrong image name for manifest (#54)

Signed-off-by: Anubhab Majumdar <[email protected]>
microsoft · Mar 15, 2024 · 7dd6cb3 · 7dd6cb3
1 parent 5e24f39
commit 7dd6cb3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
@@ -46,7 +46,7 @@ jobs:
             PLATFORM=${{ matrix.platform }}/${{ matrix.arch }}
 
   retina-win-images:
-    name: Build Agent Images
+    name: Build Agent Windows Images
     runs-on: ubuntu-latest
 
     strategy:
@@ -85,7 +85,7 @@ jobs:
     strategy:
       matrix:
         platform: ["linux"]
-        arch: ["amd64", "arm64"]
+        arch: ["amd64"]
 
     steps:
       - name: Checkout code

diff --git a/Makefile b/Makefile
@@ -232,9 +232,9 @@ buildx:
 	fi;
 
 container-docker: buildx # util target to build container images using docker buildx. do not invoke directly.
-	@os=$$(echo $(PLATFORM) | cut -d'/' -f1); \
-	@arch=$$(echo $(PLATFORM) | cut -d'/' -f2); \
-	@echo "Building for $$os/$$arch"; \
+	os=$$(echo $(PLATFORM) | cut -d'/' -f1); \
+	arch=$$(echo $(PLATFORM) | cut -d'/' -f2); \
+	echo "Building for $$os/$$arch"; \
 	docker buildx build \
 		$(ACTION) \
 		--platform $(PLATFORM) \
@@ -335,11 +335,11 @@ manifest-retina-image: ## create a multiplatform manifest for the retina image
 	$(eval FULL_IMAGE_NAME=$(IMAGE_REGISTRY)/$(RETINA_IMAGE):$(TAG))
 	$(eval FULL_INIT_IMAGE_NAME=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE):$(TAG))
 	docker buildx imagetools create -t $(FULL_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64 windows-ltsc2019-amd64 windows-ltsc2022-amd64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))
-	docker buildx imagetools create -t $(FULL_INIT_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))
+	docker buildx imagetools create -t $(FULL_INIT_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64, $(FULL_INIT_IMAGE_NAME)-$(subst /,-,$(platform)))
 
 manifest-operator-image: ## create a multiplatform manifest for the operator image
 	$(eval FULL_IMAGE_NAME=$(IMAGE_REGISTRY)/$(RETINA_OPERATOR_IMAGE):$(TAG))
-	docker buildx imagetools create -t $(FULL_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))
+	docker buildx imagetools create -t $(FULL_IMAGE_NAME) $(foreach platform,linux/amd64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))
 
 manifest-kubectl-retina-image: ## create a multiplatform manifest for the kubectl-retina image
 	$(eval FULL_IMAGE_NAME=$(IMAGE_REGISTRY)/$(KUBECTL_RETINA_IMAGE):$(TAG))

diff --git a/controller/Dockerfile.controller b/controller/Dockerfile.controller
@@ -113,7 +113,7 @@ COPY --from=tools /lib/ /lib
 COPY --from=tools /usr/lib/ /usr/lib
 
 # Copy clang+llvm.
-COPY --from=tools /usr/local/clang+llvm/bin/clang /bin
+COPY --from=tools /usr/local/clang+llvm/bin/clang /bin/clang
 
 # Copy tools.
 COPY --from=tools /tmp/bin/ /bin

diff --git a/deploy/manifests/controller/helm/retina/templates/daemonset.yaml b/deploy/manifests/controller/helm/retina/templates/daemonset.yaml
@@ -35,10 +35,6 @@ spec:
           - name: bpf
             mountPath: /sys/fs/bpf
             mountPropagation: Bidirectional
-        {{- range $name, $mountPath := .Values.volumeMounts }}
-          - name: {{ $name }}
-            mountPath: {{ $mountPath }}
-        {{- end }}
       containers:
         - name: {{ include "retina.name" . }} 
           livenessProbe: