Skip to content

Commit e1e8b88

Browse files
eapolinarioeapolinario
committed
Merge remote-tracking branch 'origin' into flyte-propeller-manager-resources
Signed-off-by: Eduardo Apolinario <[email protected]>
2 parents b416fb4 + de12c82 commit e1e8b88

File tree

674 files changed

+13142
-8219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

674 files changed

+13142
-8219
lines changed

‎.github/workflows/checks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
push:
1010
branches:
1111
- master
12+
- 'release-v**'
1213
env:
1314
GO_VERSION: "1.22"
1415
PRIORITIES: "P0"
@@ -32,8 +33,7 @@ jobs:
3233
component:
3334
- datacatalog
3435
- flyteadmin
35-
# TODO(monorepo): Enable lint flytecopilot
36-
# - flytecopilot
36+
- flytecopilot
3737
- flytectl
3838
- flyteidl
3939
- flyteplugins

‎.github/workflows/flytectl-install.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
pull_request:
99
paths:
1010
- flytectl/**
11+
- 'release-v**'
1112
push:
1213
branches:
1314
- master

‎.github/workflows/flyteidl-buf-publish.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- artifacts-shell-2
77
- artifacts
88
- master
9+
- 'release-v**'
910
paths:
1011
- 'flyteidl/**'
1112
jobs:

‎.github/workflows/flyteidl-checks.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
push:
1010
branches:
1111
- master
12+
- 'release-v**'
1213
env:
1314
GO_VERSION: "1.22"
1415
jobs:

‎.github/workflows/helm-charts.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
branches:
1111
- master
1212
- rc/*
13+
- 'release-v**'
1314
workflow_dispatch:
1415

1516
jobs:

‎.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Before Build
6060
run: ${{ inputs.before-build }}
6161
- name: Build and Push Image
62-
uses: docker/build-push-action@v3
62+
uses: docker/build-push-action@v6
6363
with:
6464
context: .
6565
file: ${{ inputs.dockerfile }}

‎.github/workflows/sandbox.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
username: "${{ secrets.FLYTE_BOT_USERNAME }}"
5454
password: "${{ secrets.FLYTE_BOT_PAT }}"
5555
- name: Build and push DIND Image
56-
uses: docker/build-push-action@v2
56+
uses: docker/build-push-action@v6
5757
with:
5858
context: .
5959
platforms: linux/arm64, linux/amd64

‎.github/workflows/single-binary.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
branches:
1111
- master
1212
- rc/*
13+
- 'release-v**'
1314
workflow_dispatch:
1415

1516
jobs:
@@ -72,7 +73,7 @@ jobs:
7273
run: |
7374
mkdir -p docker/sandbox-bundled/images/tar/{arm64,amd64}
7475
- name: Export ARM64 Image
75-
uses: docker/build-push-action@v3
76+
uses: docker/build-push-action@v6
7677
with:
7778
context: .
7879
platforms: linux/arm64
@@ -83,7 +84,7 @@ jobs:
8384
file: Dockerfile
8485
outputs: type=docker,dest=docker/sandbox-bundled/images/tar/arm64/flyte-binary.tar
8586
- name: Export AMD64 Image
86-
uses: docker/build-push-action@v3
87+
uses: docker/build-push-action@v6
8788
with:
8889
context: .
8990
platforms: linux/amd64
@@ -107,7 +108,7 @@ jobs:
107108
password: "${{ secrets.FLYTE_BOT_PAT }}"
108109
- name: Build and push Image
109110
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
110-
uses: docker/build-push-action@v3
111+
uses: docker/build-push-action@v6
111112
with:
112113
context: .
113114
platforms: linux/arm64, linux/amd64
@@ -143,7 +144,7 @@ jobs:
143144
driver-opts: image=moby/buildkit:master
144145
buildkitd-flags: "--allow-insecure-entitlement security.insecure"
145146
- name: Build sandbox image for functional tests
146-
uses: docker/build-push-action@v3
147+
uses: docker/build-push-action@v6
147148
with:
148149
context: docker/sandbox-bundled
149150
load: true
@@ -239,7 +240,7 @@ jobs:
239240
username: "${{ secrets.FLYTE_BOT_USERNAME }}"
240241
password: "${{ secrets.FLYTE_BOT_PAT }}"
241242
- name: Build and push multi-arch image
242-
uses: docker/build-push-action@v3
243+
uses: docker/build-push-action@v6
243244
with:
244245
context: docker/sandbox-bundled
245246
allow: "security.insecure"

‎.github/workflows/tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
push:
99
branches:
1010
- master
11+
- 'release-v**'
1112
pull_request:
1213
jobs:
1314
compile:

‎.github/workflows/validate-helm-charts.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- master
7+
- 'release-v**'
78
paths:
89
- "charts/**"
910
- "deployment/**"

‎CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Automatically request docs team for docs PR review
2-
/docs/ @neverett @ppiegaze
2+
/docs/ @ppiegaze
33
/docs/deployment/ @davidmirror-ops

‎Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM ghcr.io/flyteorg/flyteconsole:${FLYTECONSOLE_VERSION} AS flyteconsole
55
FROM --platform=${BUILDPLATFORM} golang:1.22-bookworm AS flytebuilder
66

77
ARG TARGETARCH
8-
ENV GOARCH "${TARGETARCH}"
9-
ENV GOOS linux
8+
ENV GOARCH="${TARGETARCH}"
9+
ENV GOOS=linux
1010

1111
WORKDIR /flyteorg/build
1212

@@ -29,10 +29,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/r
2929
FROM debian:bookworm-slim
3030

3131
ARG FLYTE_VERSION
32-
ENV FLYTE_VERSION "${FLYTE_VERSION}"
32+
ENV FLYTE_VERSION="${FLYTE_VERSION}"
3333

34-
ENV DEBCONF_NONINTERACTIVE_SEEN true
35-
ENV DEBIAN_FRONTEND noninteractive
34+
ENV DEBCONF_NONINTERACTIVE_SEEN=true
35+
ENV DEBIAN_FRONTEND=noninteractive
3636

3737
# Install core packages
3838
RUN apt-get update && apt-get install --no-install-recommends --yes \

‎Dockerfile.datacatalog

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#
44
# TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst
55

6-
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder
6+
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder
77

88

99
ARG TARGETARCH
10-
ENV GOARCH "${TARGETARCH}"
11-
ENV GOOS linux
10+
ENV GOARCH="${TARGETARCH}"
11+
ENV GOOS=linux
1212

1313
RUN apk add git openssh-client make curl
1414

‎Dockerfile.flyteadmin

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
55

6-
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder
6+
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder
77

88
ARG TARGETARCH
9-
ENV GOARCH "${TARGETARCH}"
10-
ENV GOOS linux
9+
ENV GOARCH="${TARGETARCH}"
10+
ENV GOOS=linux
1111

1212
RUN apk add git openssh-client make curl
1313

@@ -41,7 +41,7 @@ ENV PATH="/artifacts:${PATH}"
4141

4242
# This will eventually move to centurylink/ca-certs:latest for minimum possible image size
4343
FROM alpine:3.18
44-
LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteadmin
44+
LABEL org.opencontainers.image.source=https://github.com/flyteorg/flyteadmin
4545

4646
COPY --from=builder /artifacts /bin
4747

‎Dockerfile.flytecopilot

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#
44
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
55

6-
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder
6+
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder
77

88

99
ARG TARGETARCH
10-
ENV GOARCH "${TARGETARCH}"
11-
ENV GOOS linux
10+
ENV GOARCH="${TARGETARCH}"
11+
ENV GOOS=linux
1212

1313
RUN apk add git openssh-client make curl
1414

@@ -32,7 +32,7 @@ ENV PATH="/artifacts:${PATH}"
3232

3333
# This will eventually move to centurylink/ca-certs:latest for minimum possible image size
3434
FROM alpine:3.18
35-
LABEL org.opencontainers.image.source https://github.com/lyft/flyteplugins
35+
LABEL org.opencontainers.image.source=https://github.com/lyft/flyteplugins
3636

3737
COPY --from=builder /artifacts /bin
3838

‎Dockerfile.flytepropeller

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
55

66

7-
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder
7+
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder
88

99

1010
ARG TARGETARCH
11-
ENV GOARCH "${TARGETARCH}"
12-
ENV GOOS linux
11+
ENV GOARCH="${TARGETARCH}"
12+
ENV GOOS=linux
1313

1414
RUN apk add git openssh-client make curl
1515

@@ -33,7 +33,7 @@ ENV PATH="/artifacts:${PATH}"
3333

3434
# This will eventually move to centurylink/ca-certs:latest for minimum possible image size
3535
FROM alpine:3.18
36-
LABEL org.opencontainers.image.source https://github.com/flyteorg/flytepropeller
36+
LABEL org.opencontainers.image.source=https://github.com/flyteorg/flytepropeller
3737

3838
COPY --from=builder /artifacts /bin
3939

‎Dockerfile.flytescheduler

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
55

66

7-
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder
7+
FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder
88

99

1010
ARG TARGETARCH
11-
ENV GOARCH "${TARGETARCH}"
12-
ENV GOOS linux
11+
ENV GOARCH="${TARGETARCH}"
12+
ENV GOOS=linux
1313

1414
RUN apk add git openssh-client make curl
1515

@@ -36,7 +36,7 @@ ENV PATH="/artifacts:${PATH}"
3636

3737
# This will eventually move to centurylink/ca-certs:latest for minimum possible image size
3838
FROM alpine:3.18
39-
LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteadmin
39+
LABEL org.opencontainers.image.source=https://github.com/flyteorg/flyteadmin
4040

4141
COPY --from=builder /artifacts /bin
4242

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ go-tidy:
135135
make -C flyteplugins go-tidy
136136
make -C flytestdlib go-tidy
137137
make -C flytecopilot go-tidy
138+
make -C flytectl go-tidy
138139

139140
.PHONY: lint-helm-charts
140141
lint-helm-charts:

‎README.md

+1-3
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)