File tree Expand file tree Collapse file tree 2 files changed +1
-13
lines changed
test/infrastructure/docker Expand file tree Collapse file tree 2 files changed +1
-13
lines changed Original file line number Diff line number Diff line change @@ -111,14 +111,6 @@ providers = {
111
111
"third_party" ,
112
112
],
113
113
"label" : "CAPD" ,
114
- # Add kubectl to the docker image, CAPD manager requires it.
115
- "additional_docker_helper_commands" : "RUN curl -LO https://dl.k8s.io/release/{KUBE}/bin/linux/{ARCH}/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/bin/kubectl" .format (
116
- ARCH = os_arch ,
117
- KUBE = kubernetes_version ,
118
- ),
119
- "additional_docker_build_commands" : """
120
- COPY --from=tilt-helper /usr/bin/kubectl /usr/bin/kubectl
121
- """ ,
122
114
},
123
115
"test-extension" : {
124
116
"context" : "test/extension" , # NOTE: this should be kept in sync with corresponding setting in tilt-prepare
Original file line number Diff line number Diff line change 14
14
# See the License for the specific language governing permissions and
15
15
# limitations under the License.
16
16
17
+ # Build the manager binary
17
18
# Run this with docker build --build-arg builder_image=<golang:x.y.z>
18
19
ARG builder_image
19
20
@@ -33,10 +34,6 @@ ENV GOPROXY=$goproxy
33
34
# Gets additional CAPD dependencies
34
35
WORKDIR /tmp
35
36
36
- RUN curl -LO "https://dl.k8s.io/release/v1.26.0/bin/linux/${ARCH}/kubectl" && \
37
- chmod +x ./kubectl && \
38
- mv ./kubectl /usr/bin/kubectl
39
-
40
37
WORKDIR /workspace
41
38
COPY go.mod go.mod
42
39
COPY go.sum go.sum
@@ -77,6 +74,5 @@ FROM gcr.io/distroless/static:latest-${ARCH}
77
74
78
75
WORKDIR /
79
76
COPY --from=builder /workspace/manager .
80
- COPY --from=builder /usr/bin/kubectl /usr/bin/kubectl
81
77
82
78
ENTRYPOINT ["/manager" ]
You can’t perform that action at this time.
0 commit comments