*: Add sds and envoyinit to the release pipeline #10509
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,34 +20,122 @@ builds: | |
| goarch: | ||
| - amd64 | ||
| - arm64 | ||
| - id: sds | ||
| main: ./projects/sds/cmd/ | ||
| binary: sds-linux-{{ .Arch }} | ||
| gcflags: "{{ .Env.GCFLAGS }}" | ||
| ldflags: "{{ .Env.LDFLAGS }}" | ||
| env: | ||
| - CGO_ENABLED=0 | ||
| - GO111MODULE=on | ||
| - GOARCH={{ .Arch }} | ||
| - GOOS={{ .Os }} | ||
| goos: | ||
| - linux | ||
| goarch: | ||
| - amd64 | ||
| - arm64 | ||
| - id: envoyinit | ||
| main: ./projects/envoyinit/cmd/ | ||
| binary: envoyinit-linux-{{ .Arch }} | ||
| gcflags: "{{ .Env.GCFLAGS }}" | ||
| ldflags: "{{ .Env.LDFLAGS }}" | ||
| env: | ||
| - CGO_ENABLED=0 | ||
| - GO111MODULE=on | ||
| - GOARCH={{ .Arch }} | ||
| - GOOS={{ .Os }} | ||
| goos: | ||
| - linux | ||
| goarch: | ||
| - amd64 | ||
| - arm64 | ||
| dockers: | ||
| - image_templates: | ||
| - &controller_arm_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.GLOO_IMAGE_REPO }}:{{ .Env.VERSION }}-arm64" | ||
| use: buildx | ||
| dockerfile: &controller_dockerfile projects/gateway2/cmd/Dockerfile | ||
| goos: linux | ||
| goarch: arm64 | ||
| build_flag_templates: | ||
| - "--pull" | ||
| - "--platform=linux/arm64" | ||
| - "--build-arg=GOARCH=arm64" | ||
| - "--build-arg=ENVOY_IMAGE={{ .Env.ENVOY_GLOO_IMAGE }}" | ||
| - image_templates: | ||
| - &controller_amd_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.GLOO_IMAGE_REPO }}:{{ .Env.VERSION }}-amd64" | ||
| use: buildx | ||
| dockerfile: *controller_dockerfile | ||
| goos: linux | ||
| goarch: amd64 | ||
| build_flag_templates: | ||
| - "--pull" | ||
| - "--platform=linux/amd64" | ||
| - "--build-arg=GOARCH=amd64" | ||
| - "--build-arg=ENVOY_IMAGE={{ .Env.ENVOY_GLOO_IMAGE }}" | ||
| - image_templates: | ||
|
There was a problem hiding this comment. nit: can we put the images in the same order as controller image (i.e. arm first), so it's easier to read? |
||
| - &sds_arm_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.SDS_IMAGE_REPO }}:{{ .Env.VERSION }}-arm64" | ||
| use: buildx | ||
| dockerfile: &sds_dockerfile projects/sds/cmd/Dockerfile | ||
|
There was a problem hiding this comment. looking at the controller image above, there's the extra dockerfile arg for arm but not amd; why is it the other way around here? There was a problem hiding this comment. @jenshu Hmm, I'm not sure I follow. I didn't see any skew in the diff. There was a problem hiding this comment. well, it's fixed now that you swapped amd and arm :) |
||
| goos: linux | ||
| goarch: arm64 | ||
| build_flag_templates: | ||
| - "--pull" | ||
| - "--platform=linux/arm64" | ||
| - "--build-arg=GOARCH=arm64" | ||
| - "--build-arg=BASE_IMAGE={{ .Env.ALPINE_BASE_IMAGE }}" | ||
| - image_templates: | ||
| - &sds_amd_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.SDS_IMAGE_REPO }}:{{ .Env.VERSION }}-amd64" | ||
| use: buildx | ||
| dockerfile: *sds_dockerfile | ||
| goos: linux | ||
| goarch: amd64 | ||
| build_flag_templates: | ||
| - "--pull" | ||
| - "--platform=linux/amd64" | ||
| - "--build-arg=GOARCH=amd64" | ||
| - "--build-arg=BASE_IMAGE={{ .Env.ALPINE_BASE_IMAGE }}" | ||
| - image_templates: | ||
| - &envoyinit_arm_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.ENVOYINIT_IMAGE_REPO }}:{{ .Env.VERSION }}-arm64" | ||
| use: buildx | ||
| dockerfile: &envoyinit_dockerfile projects/envoyinit/cmd/Dockerfile.envoyinit | ||
| goos: linux | ||
| goarch: arm64 | ||
| build_flag_templates: | ||
| - "--pull" | ||
| - "--platform=linux/arm64" | ||
| - "--build-arg=GOARCH=arm64" | ||
| - "--build-arg=ENTRYPOINT_SCRIPT=/projects/envoyinit/cmd/docker-entrypoint.sh" | ||
| - "--build-arg=ENVOY_IMAGE={{ .Env.ENVOY_GLOO_IMAGE }}" | ||
| extra_files: | ||
| - projects/envoyinit/cmd/docker-entrypoint.sh | ||
| - image_templates: | ||
| - &envoyinit_amd_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.ENVOYINIT_IMAGE_REPO }}:{{ .Env.VERSION }}-amd64" | ||
| use: buildx | ||
| dockerfile: *envoyinit_dockerfile | ||
| goos: linux | ||
| goarch: amd64 | ||
| build_flag_templates: | ||
| - "--pull" | ||
| - "--platform=linux/amd64" | ||
| - "--build-arg=GOARCH=amd64" | ||
| - "--build-arg=ENTRYPOINT_SCRIPT=/projects/envoyinit/cmd/docker-entrypoint.sh" | ||
| - "--build-arg=ENVOY_IMAGE={{ .Env.ENVOY_GLOO_IMAGE }}" | ||
| extra_files: | ||
| - projects/envoyinit/cmd/docker-entrypoint.sh | ||
| docker_manifests: | ||
| - name_template: "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.GLOO_IMAGE_REPO }}:{{ .Env.VERSION }}" | ||
| image_templates: | ||
| - *controller_arm_image | ||
| - *controller_amd_image | ||
| - name_template: "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.SDS_IMAGE_REPO }}:{{ .Env.VERSION }}" | ||
| image_templates: | ||
| - *sds_arm_image | ||
| - *sds_amd_image | ||
| - name_template: "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.ENVOYINIT_IMAGE_REPO }}:{{ .Env.VERSION }}" | ||
| image_templates: | ||
| - *envoyinit_arm_image | ||
| - *envoyinit_amd_image | ||
| changelog: | ||
| disable: false | ||
| release: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,15 +11,16 @@ ENV DEBIAN_FRONTEND=noninteractive | |
| #install wget for our default probes | ||
| RUN apt-get update \ | ||
| && apt-get upgrade -y \ | ||
| && apt-get install wget -y \ | ||
| && rm -rf /var/log/*log /var/lib/apt/lists/* /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old | ||
|
|
||
| COPY envoyinit-linux-$GOARCH /usr/local/bin/envoyinit | ||
|
|
||
| # SDS-specific setup, only used if ENVOY_SIDECAR=true | ||
| ARG ENTRYPOINT_SCRIPT=/docker-entrypoint.sh | ||
|
There was a problem hiding this comment. This was needed as goreleaser's extra_files argument adds the path (e.g. projects/envoyinit/cmd/docker-entrypoint.sh in this case) to the build context, while this regular envoyinit-docker Makefile target fails if I hardcode the |
||
| COPY $ENTRYPOINT_SCRIPT / | ||
|
|
||
| USER 10101 | ||
|
|
||
| ENTRYPOINT ["/docker-entrypoint.sh"] | ||
| CMD [] | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needed for the SDS container build. Otherwise, the release action was failing when I was testing this out in my fork: https://github.com/timflannagan/kgateway/actions/runs/12942255998/job/36099680490.