Skip to content

Commit 4106046

Browse files
authored
Merge pull request #997 from gthao313/remove-metal
remove bottlerocket metal test agent
2 parents b5ef413 + 84334c1 commit 4106046

9 files changed

Lines changed: 3 additions & 975 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 128 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -176,31 +176,6 @@ COPY --from=build-src /usr/share/licenses/testsys /licenses/testsys
176176

177177
CMD dockerd --storage-driver vfs &>/dev/null & ./vsphere-k8s-cluster-resource-agent
178178

179-
# =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=
180-
# Builds the Metal K8s cluster resource agent image
181-
FROM public.ecr.aws/amazonlinux/amazonlinux:2 as metal-k8s-cluster-resource-agent
182-
183-
RUN yum install -y \
184-
openssh-clients \
185-
tar \
186-
&& yum clean all
187-
RUN amazon-linux-extras install -y docker
188-
189-
# Copy eksctl
190-
COPY --from=tools /eksctl /usr/bin/eksctl
191-
COPY --from=tools /licenses/eksctl /licenses/eksctl
192-
193-
# Copy kubectl
194-
COPY --from=tools /kubectl /usr/local/bin/kubectl
195-
COPY --from=tools /licenses/kubernetes /licenses/kubernetes
196-
197-
# Copy binary
198-
COPY --from=build-src /src/bottlerocket/agents/bin/metal-k8s-cluster-resource-agent ./
199-
# Copy licenses
200-
COPY --from=build-src /usr/share/licenses/testsys /licenses/testsys
201-
202-
CMD dockerd --storage-driver vfs &>/dev/null & ./metal-k8s-cluster-resource-agent
203-
204179
# =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=
205180
# Builds the ECS test agent image
206181
FROM public.ecr.aws/amazonlinux/amazonlinux:2 as ecs-test-agent

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TESTSYS_BUILD_GOPROXY ?= direct
2626
# project
2727
AGENT_IMAGES = sonobuoy-test-agent ec2-resource-agent eks-resource-agent ecs-resource-agent \
2828
migration-test-agent vsphere-vm-resource-agent vsphere-k8s-cluster-resource-agent \
29-
ecs-test-agent k8s-workload-agent ecs-workload-agent metal-k8s-cluster-resource-agent \
29+
ecs-test-agent k8s-workload-agent ecs-workload-agent \
3030
ec2-karpenter-resource-agent
3131

3232
# The set of container images. Add additional artifacts here when added

bottlerocket/agents/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ k8s-openapi = { version = "0.21", default-features = false, features = ["v1_24"]
2828
kube = { version = "0.88", default-features = false, features = ["config", "derive", "client"] }
2929
log = "0.4"
3030
maplit = "1"
31-
openssh = { version = "0.10", features = ["native-mux"] }
3231
testsys-model = { version = "0.0.17", path = "../../model" }
3332
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "blocking"] }
3433
resource-agent = { version = "0.0.17", path = "../../agent/resource-agent" }

bottlerocket/agents/src/bin/metal-k8s-cluster-resource-agent/main.rs

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)