feat: Join images to a single dockerfile (#416)

- join image to a single dockerfile - remove old meetup files as lots are no longer accurate - update release process to a single image Signed-off-by: Brian Davis <dbrian@vmware.com>
vmware · Aug 26, 2023 · 5333167 · 5333167
1 parent d28e997
commit 5333167
Show file tree

Hide file tree

Showing 47 changed files with 48 additions and 384 deletions.
diff --git a/.github/workflows/build-workflow.yaml b/.github/workflows/build-workflow.yaml
@@ -17,16 +17,11 @@ jobs:
         with:
           version: "v0.9.0"
       - uses: FranzDiebold/github-env-vars-action@v1.2.1
-      - name: lint-test-config-reloader
-        run: |
-          cd config-reloader && make test
-      - name: build-base-image
+      - name: build-image
         run: |
           export TESTCONTAINERS_RYUK_DISABLED=true
-          cd base-image && make build-test-ci
-      - name: build-config-reloader
-        run: |
-          cd config-reloader && make build-image TAG=v$GITHUB_SHA_SHORT
+          make build-test-ci
+          make build-image TAG=v$GITHUB_SHA_SHORT
       - name: load-image
         run: |
           kind load docker-image vmware/kube-fluentd-operator:v$GITHUB_SHA_SHORT

diff --git a/.github/workflows/release-workflow.yaml b/.github/workflows/release-workflow.yaml
@@ -16,12 +16,9 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: build-base
-        run: |
-          cd base-image && make build-image
       - name: push-image
         run: |
-          cd config-reloader && make push-image && make push-latest
+          make push-image && make push-latest
         env:
           TAG: ${{github.ref_name}}
 

diff --git a/base-image/Dockerfile → Dockerfile b/base-image/Dockerfile → Dockerfile
@@ -2,6 +2,19 @@
 # SPDX-License-Identifier: BSD-2-Clause
 # Similar to https://github.com/drecom/docker-centos-ruby/blob/2.6.5-slim/Dockerfile
 
+
+FROM golang:1.19 as builder
+
+WORKDIR /go/src/github.com/vmware/kube-fluentd-operator/config-reloader
+COPY config-reloader .
+COPY Makefile .
+
+# Speed up local builds where vendor is populated
+ARG VERSION
+# Good to have another test run as this container is different than lint container
+RUN make in-docker-test
+RUN make build VERSION=$VERSION
+
 FROM photon:4.0 
 
 ARG RVM_PATH=/usr/local/rvm
@@ -47,7 +60,7 @@ RUN tdnf clean all && \
 
 SHELL [ "/bin/bash", "-l", "-c" ]
 
-COPY failsafe.conf entrypoint.sh Gemfile Gemfile.lock /fluentd/
+COPY image/failsafe.conf image/entrypoint.sh image/Gemfile image/Gemfile.lock /fluentd/
 
 # Install the gems with bundler is better practice
 # We need to keep this as a single layer because of the builddeps
@@ -94,7 +107,11 @@ RUN tdnf install -y $BUILDDEPS \
   && tdnf remove -y $BUILDDEPS \
   && tdnf clean all
 
-COPY plugins /fluentd/plugins
+COPY image/plugins /fluentd/plugins
+
+COPY config-reloader/templates /templates
+COPY config-reloader/validate-from-dir.sh /bin/validate-from-dir.sh
+COPY --from=builder /go/src/github.com/vmware/kube-fluentd-operator/config-reloader/config-reloader /bin/config-reloader
 
 # Make sure fluentd picks jemalloc 5.3.0 lib as default
 ENV LD_PRELOAD="/usr/lib/libjemalloc.so"

diff --git a/config-reloader/Makefile → Makefile b/config-reloader/Makefile → Makefile
@@ -23,11 +23,13 @@ DEV_ENV_CMD      := docker run --rm -v ${CURRENT_DIR}:${DEV_ENV_WORK_DIR} -w ${D
 
 all: test build
 
+.PHONY: test-image
+
 dev:
 	${DEV_ENV_CMD} bash
 
 vendor:
-	${GO} mod vendor
+	cd config-reloader && ${GO} mod vendor
 
 install:
 	${GO} install -v .
@@ -69,7 +71,7 @@ clean:
 	rm -fr config-reloader pkg > /dev/null
 
 build-image:
-	docker build --build-arg VERSION=$(VERSION) -t $(IMAGE):$(TAG) .
+	DOCKER_BUILDKIT=1 docker build --build-arg VERSION=$(VERSION) -t $(IMAGE):$(TAG) .
 
 push-image: build-image
 	docker push $(IMAGE):$(TAG)
@@ -161,3 +163,24 @@ shell:
 	docker run --entrypoint=/bin/bash \
 		-ti --rm -v `pwd`:/workspace --net=host \
 		$(IMAGE):$(TAG)
+
+test-image: build-image
+	docker run -t --rm \
+	  --net=host \
+	  -v `pwd`:/workspace \
+	  -v `pwd`/image/test/containers:/var/log/containers \
+	  -v `pwd`/image/test/input.conf:/fluentd/etc/input.conf \
+	  -v `pwd`/image/test/local.conf:/fluentd/etc/fluent.conf \
+	  -e FLUENTD_OPT="--no-supervisor" \
+	  $(IMAGE):$(TAG)
+
+list-gems:
+	@docker run -ti --rm \
+	  --net=host --entrypoint /bin/bash \
+	  $(IMAGE):$(TAG) \
+	  -c 'fluent-gem list' | \
+	  grep '^fluent' | sed 's/^/* /'
+
+build-test-ci: build-image
+	cd image && TEST_IMAGE_NAME=$(IMAGE) TEST_IMAGE_TAG=$(TAG) go test -mod=readonly -v -count=1 --race ./...
+	cd config-reloader && go test -mod=readonly -v -count=1 --race ./...
diff --git a/base-image/Makefile b/base-image/Makefile
diff --git a/config-reloader/Dockerfile b/config-reloader/Dockerfile
diff --git a/config-reloader/controller/controller.go b/config-reloader/controller/controller.go
@@ -33,7 +33,6 @@ var _ Controller = &controllerInstance{}
 
 // New creates new controller
 func New(ctx context.Context, cfg *config.Config, ds datasource.Datasource, up Updater) (Controller, error) {
-
 	var reloader *fluentd.Reloader
 	gen := generator.New(ctx, cfg)
 	gen.SetStatusUpdater(ctx, ds)

diff --git a/base-image/Gemfile → image/Gemfile b/base-image/Gemfile → image/Gemfile
diff --git a/base-image/Gemfile.lock → image/Gemfile.lock b/base-image/Gemfile.lock → image/Gemfile.lock
diff --git a/base-image/entrypoint.sh → image/entrypoint.sh b/base-image/entrypoint.sh → image/entrypoint.sh
diff --git a/base-image/failsafe.conf → image/failsafe.conf b/base-image/failsafe.conf → image/failsafe.conf
diff --git a/base-image/fluentd_test.go → image/fluentd_test.go b/base-image/fluentd_test.go → image/fluentd_test.go
diff --git a/base-image/go.mod → image/go.mod b/base-image/go.mod → image/go.mod
diff --git a/base-image/go.sum → image/go.sum b/base-image/go.sum → image/go.sum
diff --git a/base-image/plugins/filter_dedot.rb → image/plugins/filter_dedot.rb b/base-image/plugins/filter_dedot.rb → image/plugins/filter_dedot.rb
diff --git a/base-image/plugins/filter_extract.rb → image/plugins/filter_extract.rb b/base-image/plugins/filter_extract.rb → image/plugins/filter_extract.rb
diff --git a/base-image/plugins/in_just_exit.rb → image/plugins/in_just_exit.rb b/base-image/plugins/in_just_exit.rb → image/plugins/in_just_exit.rb
diff --git a/...e/plugins/out_truncating_remote_syslog.rb → ...e/plugins/out_truncating_remote_syslog.rb b/...e/plugins/out_truncating_remote_syslog.rb → ...e/plugins/out_truncating_remote_syslog.rb
diff --git a/base-image/plugins/parser_kubernetes.rb → image/plugins/parser_kubernetes.rb b/base-image/plugins/parser_kubernetes.rb → image/plugins/parser_kubernetes.rb
diff --git a/base-image/plugins/parser_logfmt.rb → image/plugins/parser_logfmt.rb b/base-image/plugins/parser_logfmt.rb → image/plugins/parser_logfmt.rb
diff --git a/...ge/plugins/parser_multiline_kubernetes.rb → image/plugins/parser_multiline_kubernetes.rb b/...ge/plugins/parser_multiline_kubernetes.rb → image/plugins/parser_multiline_kubernetes.rb
diff --git a/base-image/test/ci.conf → image/test/ci.conf b/base-image/test/ci.conf → image/test/ci.conf
diff --git a/...8fc2e6b52bc344658de7d3f08c36a2e804115.log → ...8fc2e6b52bc344658de7d3f08c36a2e804115.log b/...8fc2e6b52bc344658de7d3f08c36a2e804115.log → ...8fc2e6b52bc344658de7d3f08c36a2e804115.log
diff --git a/base-image/test/extract.log → image/test/extract.log b/base-image/test/extract.log → image/test/extract.log
diff --git a/base-image/test/input.conf → image/test/input.conf b/base-image/test/input.conf → image/test/input.conf
diff --git a/base-image/test/json.log → image/test/json.log b/base-image/test/json.log → image/test/json.log
diff --git a/base-image/test/kube-apiserver.log → image/test/kube-apiserver.log b/base-image/test/kube-apiserver.log → image/test/kube-apiserver.log
diff --git a/base-image/test/kube-controller.log → image/test/kube-controller.log b/base-image/test/kube-controller.log → image/test/kube-controller.log
diff --git a/base-image/test/local.conf → image/test/local.conf b/base-image/test/local.conf → image/test/local.conf
diff --git a/base-image/test/logfmt.log → image/test/logfmt.log b/base-image/test/logfmt.log → image/test/logfmt.log
diff --git a/base-image/test/results/extract.out → image/test/results/extract.out b/base-image/test/results/extract.out → image/test/results/extract.out
diff --git a/base-image/test/results/json.out → image/test/results/json.out b/base-image/test/results/json.out → image/test/results/json.out
diff --git a/...e6b52bc344658de7d3f08c36a2e804115.log.out → ...e6b52bc344658de7d3f08c36a2e804115.log.out b/...e6b52bc344658de7d3f08c36a2e804115.log.out → ...e6b52bc344658de7d3f08c36a2e804115.log.out
diff --git a/base-image/test/results/kubernetes.out → image/test/results/kubernetes.out b/base-image/test/results/kubernetes.out → image/test/results/kubernetes.out
diff --git a/base-image/test/results/logfmt.out → image/test/results/logfmt.out b/base-image/test/results/logfmt.out → image/test/results/logfmt.out
diff --git a/base-image/test/truncator.log → image/test/truncator.log b/base-image/test/truncator.log → image/test/truncator.log
diff --git a/meetup-2018-11-22/.gitignore b/meetup-2018-11-22/.gitignore
diff --git a/meetup-2018-11-22/Dockerfile b/meetup-2018-11-22/Dockerfile
diff --git a/meetup-2018-11-22/Makefile b/meetup-2018-11-22/Makefile
diff --git a/meetup-2018-11-22/cat-london.yaml b/meetup-2018-11-22/cat-london.yaml
diff --git a/meetup-2018-11-22/cat-paris.yaml b/meetup-2018-11-22/cat-paris.yaml
diff --git a/meetup-2018-11-22/config-london.yaml b/meetup-2018-11-22/config-london.yaml
diff --git a/meetup-2018-11-22/config-paris.yaml b/meetup-2018-11-22/config-paris.yaml
diff --git a/meetup-2018-11-22/dog-london.yaml b/meetup-2018-11-22/dog-london.yaml