Skip to content

Commit 10ec849

Browse files
authored
Merge pull request #9 from css-ch/feature/remove-patch-update-fluentd-operator
remove patch and update fluentd-operator
2 parents a772197 + 4b8b4c6 commit 10ec849

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

Dockerfile

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
1-
# Use patched reloader. Can be removed after version with fix (https://github.com/vmware/kube-fluentd-operator/pull/360) is available.
2-
FROM golang:1.18 as builder
3-
WORKDIR /go/src/github.com/vmware/kube-fluentd-operator
4-
RUN set -e \
5-
&& git clone --depth 1 --branch bugfix/migration-mode-with-cr-namespaces https://github.com/jonasrutishauser/kube-fluentd-operator.git . \
6-
&& cd config-reloader \
7-
&& GO111MODULE=on GOARCH=amd64 CGO_ENABLED=0 go build -v -ldflags "-X github.com/vmware/kube-fluentd-operator/config-reloader/config.Version=1.16.8-1 -w -s" .
8-
# End patch build
9-
10-
FROM vmware/kube-fluentd-operator:v1.16.8
1+
FROM vmware/kube-fluentd-operator:v1.17.6
112

123
RUN set -e \
134
&& tdnf install -y jq sed \
145
&& gem install -N fluent-plugin-jq -v "0.5.1" \
156
&& echo OK
167

17-
# Use patched reloader
18-
COPY --from=builder /go/src/github.com/vmware/kube-fluentd-operator/config-reloader/config-reloader /bin/config-reloader
19-
208
# Patch configuration files:
219
# - relabel all at end to allow default match in kube-system.conf (is before all other namespaces)
2210
# - kubelet.log of rancher is in /var/lib/rancher/rke2/agent/logs

0 commit comments

Comments
 (0)