Skip to content

Commit d4a5db5

Browse files
committed
remove tailscale from custom-os-image
1 parent fd138cb commit d4a5db5

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

test/custom-os-images/Containerfile.rhel-coreos-10

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ FROM registry.ci.openshift.org/ocp/4.21:rhel-coreos-10 AS base
33
FROM quay.io/centos/centos:stream10 AS epel
44
WORKDIR /etc/yum.repos.d
55
RUN dnf install -y --setopt=keepcache=True epel-release && \
6-
curl -LO https://pkgs.tailscale.com/stable/rhel/10/tailscale.repo && \
76
sed -i 's/\$stream/10-stream/g' /etc/yum.repos.d/centos*.repo && \
87
sed -i 's/EPEL\-\$releasever_major/EPEL-10/g' /etc/yum.repos.d/epel*.repo && \
98
sed -i -E 's/\$\{releasever_minor\:\+\-z\}//g' /etc/yum.repos.d/epel*.repo
109

1110
FROM base AS final
1211
COPY --from=epel /etc/yum.repos.d /etc/yum.repos.d
1312
COPY --from=epel /etc/pki/rpm-gpg/RPM-GPG-KEY-* /etc/pki/rpm-gpg/
14-
RUN rpm-ostree install ripgrep yq tailscale && \
13+
RUN rpm-ostree install ripgrep yq && \
1514
ostree container commit

test/custom-os-images/Containerfile.rhel-coreos-9

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ FROM registry.ci.openshift.org/ocp/4.21:rhel-coreos AS base
33
FROM quay.io/centos/centos:stream9 AS epel
44
WORKDIR /etc/yum.repos.d
55
RUN dnf install -y epel-release && \
6-
curl -LO https://pkgs.tailscale.com/stable/rhel/9/tailscale.repo && \
76
sed -i 's/\$stream/9-stream/g' /etc/yum.repos.d/centos*.repo
87

98
FROM base AS final
109
COPY --from=epel /etc/yum.repos.d /etc/yum.repos.d
1110
COPY --from=epel /etc/pki/rpm-gpg/RPM-GPG-KEY-* /etc/pki/rpm-gpg/
12-
RUN rpm-ostree install ripgrep yq tailscale && \
11+
RUN rpm-ostree install ripgrep yq && \
1312
ostree container commit

test/e2e-2of2/osimageurl_override_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ func TestOSImageURLOverride(t *testing.T) {
3737
node := helpers.GetRandomNode(t, cs, "worker")
3838

3939
binaries := []string{
40-
"/usr/bin/tailscale",
4140
"/usr/bin/rg",
4241
"/usr/bin/yq",
4342
}

0 commit comments

Comments
 (0)