Skip to content

Commit bcfcece

Browse files
denis-codefreshdenis-codefresh
committed
feat: initial cf commit
Signed-off-by: Denis <[email protected]>
1 parent eddb1b7 commit bcfcece

File tree

14 files changed

+129
-94
lines changed

14 files changed

+129
-94
lines changed

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ contact_links:
44
- name: Have you read the docs?
55
url: https://argoproj.github.io/argo-workflows/
66
about: Much help can be found in the docs
7-
- name: Ask a question
8-
url: https://github.com/argoproj/argo-workflows/discussions/new
7+
- name: Ask a question about Codefresh's Argo Worklfows
8+
url: https://github.com/codefresh-io/argo-workflows/discussions/new
99
about: Ask a question or start a discussion about workflows
1010
- name: Chat on Slack
1111
url: https://argoproj.github.io/community/join-slack

‎.github/workflows/ci-build.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
pull_request:
99
branches:
1010
- "master"
11+
- "release-*"
1112

1213
concurrency:
1314
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/default-branch-check.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: PR check
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "release-*"
7+
8+
jobs:
9+
test-default-branch:
10+
name: base branch is a default branch
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: fail if base branch is not default branch
14+
if: ${{ github.event.pull_request.base.ref != github.event.repository.default_branch }}
15+
uses: actions/github-script@v3
16+
with:
17+
script: |
18+
core.setFailed("Base branch of the PR - ${{ github.event.pull_request.base.ref }} is not a default branch. Please reopen your PR to ${{ github.event.repository.default_branch }}")

‎.github/workflows/release.yaml‎

Lines changed: 77 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- v*
77
branches:
88
- master
9+
- release-*
910
- dev-*
1011

1112
concurrency:
@@ -22,7 +23,7 @@ permissions:
2223
jobs:
2324
build-linux-amd64:
2425
name: Build & push linux/amd64
25-
if: github.repository == 'argoproj/argo-workflows'
26+
if: github.repository == 'codefresh-io/argo-workflows'
2627
runs-on: ubuntu-latest
2728
strategy:
2829
matrix:
@@ -43,11 +44,12 @@ jobs:
4344
restore-keys: |
4445
${{ runner.os }}-${{ matrix.platform }}-${{ matrix.target }}-buildx-
4546
46-
- name: Docker Login
47-
uses: docker/login-action@v2
48-
with:
49-
username: ${{ secrets.DOCKERIO_USERNAME }}
50-
password: ${{ secrets.DOCKERIO_PASSWORD }}
47+
## Codefresh - remove dockerhub
48+
# - name: Docker Login
49+
# uses: docker/login-action@v1
50+
# with:
51+
# username: ${{ secrets.DOCKERIO_USERNAME }}
52+
# password: ${{ secrets.DOCKERIO_PASSWORD }}
5153

5254
- name: Docker Login
5355
uses: docker/login-action@v2
@@ -70,13 +72,14 @@ jobs:
7072
tag_suffix=$(echo $PLATFORM | sed -r "s/\//-/g")
7173
image_name="${DOCKERIO_ORG}/${TARGET}:${tag}-${tag_suffix}"
7274
73-
docker buildx build \
74-
--cache-from "type=local,src=/tmp/.buildx-cache" \
75-
--cache-to "type=local,dest=/tmp/.buildx-cache" \
76-
--output "type=image,push=true" \
77-
--platform="${PLATFORM}" \
78-
--target $TARGET \
79-
--tag $image_name .
75+
## Codefresh - remove dockerhub
76+
# docker buildx build \
77+
# --cache-from "type=local,src=/tmp/.buildx-cache" \
78+
# --cache-to "type=local,dest=/tmp/.buildx-cache" \
79+
# --output "type=image,push=true" \
80+
# --platform="${PLATFORM}" \
81+
# --target $TARGET \
82+
# --tag $image_name .
8083
8184
docker buildx build \
8285
--cache-from "type=local,src=/tmp/.buildx-cache" \
@@ -88,7 +91,7 @@ jobs:
8891
8992
build-linux-arm64:
9093
name: Build & push linux/arm64
91-
if: github.repository == 'argoproj/argo-workflows'
94+
if: github.repository == 'codefresh-io/argo-workflows'
9295
runs-on: ubuntu-latest
9396
strategy:
9497
matrix:
@@ -114,11 +117,12 @@ jobs:
114117
restore-keys: |
115118
${{ runner.os }}-${{ matrix.platform }}-${{ matrix.target }}-buildx-
116119
117-
- name: Docker Login
118-
uses: docker/login-action@v2
119-
with:
120-
username: ${{ secrets.DOCKERIO_USERNAME }}
121-
password: ${{ secrets.DOCKERIO_PASSWORD }}
120+
## Codefresh - remove dockerhub
121+
# - name: Docker Login
122+
# uses: docker/login-action@v1
123+
# with:
124+
# username: ${{ secrets.DOCKERIO_USERNAME }}
125+
# password: ${{ secrets.DOCKERIO_PASSWORD }}
122126

123127
- name: Docker Login
124128
uses: docker/login-action@v2
@@ -141,13 +145,14 @@ jobs:
141145
tag_suffix=$(echo $PLATFORM | sed -r "s/\//-/g")
142146
image_name="${DOCKERIO_ORG}/${TARGET}:${tag}-${tag_suffix}"
143147
144-
docker buildx build \
145-
--cache-from "type=local,src=/tmp/.buildx-cache" \
146-
--cache-to "type=local,dest=/tmp/.buildx-cache" \
147-
--output "type=image,push=true" \
148-
--platform="${PLATFORM}" \
149-
--target $TARGET \
150-
--tag $image_name .
148+
## Codefresh - remove dockerhub
149+
# docker buildx build \
150+
# --cache-from "type=local,src=/tmp/.buildx-cache" \
151+
# --cache-to "type=local,dest=/tmp/.buildx-cache" \
152+
# --output "type=image,push=true" \
153+
# --platform="${PLATFORM}" \
154+
# --target $TARGET \
155+
# --tag $image_name .
151156
152157
docker buildx build \
153158
--cache-from "type=local,src=/tmp/.buildx-cache" \
@@ -159,15 +164,16 @@ jobs:
159164
160165
build-windows:
161166
name: Build & push windows
162-
if: github.repository == 'argoproj/argo-workflows'
167+
if: github.repository == 'codefresh-io/argo-workflows'
163168
runs-on: windows-2019
164169
steps:
165-
- uses: actions/checkout@v3
166-
- name: Docker Login
167-
uses: Azure/docker-login@v1
168-
with:
169-
username: ${{ secrets.DOCKERIO_USERNAME }}
170-
password: ${{ secrets.DOCKERIO_PASSWORD }}
170+
- uses: actions/checkout@v2
171+
## Codefresh - remove dockerhub
172+
# - name: Docker Login
173+
# uses: Azure/docker-login@v1
174+
# with:
175+
# username: ${{ secrets.DOCKERIO_USERNAME }}
176+
# password: ${{ secrets.DOCKERIO_PASSWORD }}
171177

172178
- name: Login to Quay
173179
uses: Azure/docker-login@v1
@@ -191,24 +197,26 @@ jobs:
191197
for target in $targets; do
192198
image_name="${docker_org}/${target}:${tag}-windows"
193199
docker build --target $target -t $image_name -f Dockerfile.windows .
194-
docker push $image_name
200+
## Codefresh - remove dockerhub
201+
# docker push $image_name
195202
196203
docker tag $image_name quay.io/$image_name
197204
docker push quay.io/$image_name
198205
done
199206
200207
push-images:
201208
name: Push manifest with all images
202-
if: github.repository == 'argoproj/argo-workflows'
209+
if: github.repository == 'codefresh-io/argo-workflows'
203210
runs-on: ubuntu-latest
204211
needs: [ build-linux-amd64, build-linux-arm64, build-windows ]
205212
steps:
206-
- uses: actions/checkout@v3
207-
- name: Docker Login
208-
uses: Azure/docker-login@v1
209-
with:
210-
username: ${{ secrets.DOCKERIO_USERNAME }}
211-
password: ${{ secrets.DOCKERIO_PASSWORD }}
213+
- uses: actions/checkout@v2
214+
## Codefresh - remove dockerhub
215+
# - name: Docker Login
216+
# uses: Azure/docker-login@v1
217+
# with:
218+
# username: ${{ secrets.DOCKERIO_USERNAME }}
219+
# password: ${{ secrets.DOCKERIO_PASSWORD }}
212220

213221
- name: Login to Quay
214222
uses: Azure/docker-login@v1
@@ -235,32 +243,36 @@ jobs:
235243
image_name="${docker_org}/${target}:${tag}"
236244
237245
if [ $target = "argoexec" ]; then
238-
docker manifest create $image_name ${image_name}-linux-arm64 ${image_name}-linux-amd64 ${image_name}-windows
246+
## Codefresh - remove dockerhub
247+
# docker manifest create $image_name ${image_name}-linux-arm64 ${image_name}-linux-amd64 ${image_name}-windows
239248
docker manifest create quay.io/$image_name quay.io/${image_name}-linux-arm64 quay.io/${image_name}-linux-amd64 quay.io/${image_name}-windows
240249
else
241-
docker manifest create $image_name ${image_name}-linux-arm64 ${image_name}-linux-amd64
250+
## Codefresh - remove dockerhub
251+
# docker manifest create $image_name ${image_name}-linux-arm64 ${image_name}-linux-amd64
242252
docker manifest create quay.io/$image_name quay.io/${image_name}-linux-arm64 quay.io/${image_name}-linux-amd64
243253
fi
244254
245-
docker manifest push $image_name
255+
## Codefresh - remove dockerhub
256+
# docker manifest push $image_name
246257
docker manifest push quay.io/$image_name
247258
done
248259
249260
test-images-linux-amd64:
250261
name: Try pulling linux/amd64
251-
if: github.repository == 'argoproj/argo-workflows'
262+
if: github.repository == 'codefresh-io/argo-workflows'
252263
runs-on: ubuntu-latest
253264
needs: [ push-images ]
254265
strategy:
255266
matrix:
256267
platform: [ linux/amd64 ]
257268
target: [ workflow-controller, argocli, argoexec ]
258269
steps:
259-
- name: Docker Login
260-
uses: Azure/docker-login@v1
261-
with:
262-
username: ${{ secrets.DOCKERIO_USERNAME }}
263-
password: ${{ secrets.DOCKERIO_PASSWORD }}
270+
## Codefresh - remove dockerhub
271+
# - name: Docker Login
272+
# uses: Azure/docker-login@v1
273+
# with:
274+
# username: ${{ secrets.DOCKERIO_USERNAME }}
275+
# password: ${{ secrets.DOCKERIO_PASSWORD }}
264276

265277
- name: Login to Quay
266278
uses: Azure/docker-login@v1
@@ -281,20 +293,22 @@ jobs:
281293
fi
282294
283295
image_name="${DOCKERIO_ORG}/${TARGET}:${tag}"
284-
docker pull $image_name
296+
## Codefresh - remove dockerhub
297+
# docker pull $image_name
285298
docker pull quay.io/$image_name
286299
287300
test-images-windows:
288301
name: Try pulling windows
289-
if: github.repository == 'argoproj/argo-workflows'
302+
if: github.repository == 'codefresh-io/argo-workflows'
290303
runs-on: windows-2019
291304
needs: [ push-images ]
292305
steps:
293-
- name: Docker Login
294-
uses: Azure/docker-login@v1
295-
with:
296-
username: ${{ secrets.DOCKERIO_USERNAME }}
297-
password: ${{ secrets.DOCKERIO_PASSWORD }}
306+
## Codefresh - remove dockerhub
307+
# - name: Docker Login
308+
# uses: Azure/docker-login@v1
309+
# with:
310+
# username: ${{ secrets.DOCKERIO_USERNAME }}
311+
# password: ${{ secrets.DOCKERIO_PASSWORD }}
298312

299313
- name: Login to Quay
300314
uses: Azure/docker-login@v1
@@ -315,15 +329,16 @@ jobs:
315329
targets="argoexec"
316330
for target in $targets; do
317331
image_name="${docker_org}/${target}:${tag}"
318-
docker pull $image_name
332+
## Codefresh - remove dockerhub
333+
# docker pull $image_name
319334
docker pull quay.io/$image_name
320335
done
321336
322337
publish-release:
323338
permissions:
324339
contents: write # for softprops/action-gh-release to create GitHub release
325340
runs-on: ubuntu-latest
326-
if: github.repository == 'argoproj/argo-workflows'
341+
if: github.repository == 'codefresh-io/argo-workflows'
327342
needs: [ push-images, test-images-linux-amd64, test-images-windows ]
328343
env:
329344
NODE_OPTIONS: --max-old-space-size=4096
@@ -348,31 +363,14 @@ jobs:
348363
path: /home/runner/go/pkg/mod
349364
key: GOMODCACHE-v2-${{ hashFiles('**/go.mod') }}
350365
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
351-
- run: |
352-
if [ ${GITHUB_REF##*/} = master ]; then
353-
echo "VERSION=latest" >> $GITHUB_ENV
354-
else
355-
echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
356-
fi
357-
- run: go install sigs.k8s.io/bom/cmd/[email protected]
358-
- run: go install github.com/spdx/spdx-sbom-generator/cmd/[email protected]
359-
- run: mkdir -p dist
360-
- run: generator -o dist -p .
361-
- run: yarn --cwd ui install
362-
- run: generator -o dist -p ui
363-
- run: bom generate --image quay.io/argoproj/workflow-controller:$VERSION -o dist/workflow-controller.spdx
364-
- run: bom generate --image quay.io/argoproj/argocli:$VERSION -o dist/argocli.spdx
365-
- run: bom generate --image quay.io/argoproj/argoexec:$VERSION -o dist/argoexec.spdx
366-
# pack the boms into one file to make it easy to download
367-
- run: tar -zcf dist/sbom.tar.gz dist/*.spdx
368-
- run: make release-notes VERSION=$VERSION
366+
- run: make release-notes VERSION=${GITHUB_REF##*/}
369367
- run: cat release-notes
370-
- run: make manifests VERSION=$VERSION
368+
- run: make manifests VERSION=${GITHUB_REF##*/}
371369
- name: Print image tag (please check it is not `:latest`)
372370
run: |
373371
grep image: dist/manifests/install.yaml
374372
- run: go mod download
375-
- run: make clis STATIC_FILES=true VERSION=$VERSION
373+
- run: make clis STATIC_FILES=true VERSION=${GITHUB_REF##*/}
376374
- name: Print version (please check it is not dirty)
377375
run: dist/argo-linux-amd64 version
378376
- run: make checksums

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-o
156156

157157
## Project Resources
158158

159-
* Argo GitHub: https://github.com/argoproj
159+
* Codefresh Argo GitHub: https://github.com/codefresh-io
160160
* Argo Website: https://argoproj.github.io/
161161
* Argo Slack: [click here to join](https://argoproj.github.io/community/join-slack)
162162

‎examples/k8s-orchestration.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
parameters:
6767
- name: job-uid
6868
container:
69-
image: argoproj/argoexec:latest
69+
image: quay.io/codefresh/argoexec:latest
7070
command: [sh, -c]
7171
args: ["
7272
for i in `kubectl get pods -l controller-uid={{inputs.parameters.job-uid}} -o name`; do

‎manifests/base/argo-server/argo-server-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
serviceAccountName: argo-server
1515
containers:
1616
- name: argo-server
17-
image: quay.io/argoproj/argocli:latest
17+
image: quay.io/codefresh/argocli:latest
1818
securityContext:
1919
readOnlyRootFilesystem: true
2020
runAsNonRoot: true

‎manifests/base/workflow-controller/workflow-controller-deployment.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: argo
1616
containers:
1717
- name: workflow-controller
18-
image: quay.io/argoproj/workflow-controller:latest
18+
image: quay.io/codefresh/workflow-controller:latest
1919
securityContext:
2020
readOnlyRootFilesystem: true
2121
runAsNonRoot: true
@@ -25,7 +25,11 @@ spec:
2525
- ALL
2626
command:
2727
- workflow-controller
28-
args: [ ]
28+
args:
29+
- --configmap
30+
- workflow-controller-configmap
31+
- --executor-image
32+
- quay.io/codefresh/argoexec:latest
2933
env:
3034
- name: LEADER_ELECTION_IDENTITY
3135
valueFrom:

0 commit comments

Comments
 (0)