Skip to content

Commit d18c48e

Browse files
elad-codefreshelad-codefresh
committed
merge conflicts
2 parents 08cf10e + 21e8831 commit d18c48e

16 files changed

+58
-31
lines changed

‎.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/docker-publish.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Docker
33
on:
44
push:
55
branches:
6-
- master
6+
# - master # commented due to Codefresh convention
77
- release-*
88

99
# Run tests for any PRs.
@@ -36,28 +36,30 @@ jobs:
3636
uses: docker/metadata-action@v3
3737
with:
3838
images: |
39-
quay.io/argoproj/argo-rollouts
40-
# ghcr.io/argoproj/argo-rollouts
39+
quay.io/codefresh/argo-rollouts
40+
# ghcr.io/codefresh-io/argo-rollouts
4141
tags: |
4242
type=ref,event=branch
43-
flavor: |
44-
latest=${{ github.ref == 'refs/heads/master' }}
43+
# commented due to Codefresh convention
44+
# flavor: |
45+
# latest=${{ github.ref == 'refs/heads/master' }}
4546

4647
- name: Docker meta (plugin)
4748
id: plugin-meta
4849
uses: docker/metadata-action@v3
4950
with:
5051
images: |
51-
quay.io/argoproj/kubectl-argo-rollouts
52-
# ghcr.io/argoproj/kubectl-argo-rollouts
52+
quay.io/codefresh/kubectl-argo-rollouts
53+
# ghcr.io/codefresh-io/kubectl-argo-rollouts
5354
tags: |
5455
type=ref,event=branch
55-
flavor: |
56-
latest=${{ github.ref == 'refs/heads/master' }}
56+
# commented due to Codefresh convention
57+
# flavor: |
58+
# latest=${{ github.ref == 'refs/heads/master' }}
5759

5860
# - name: Login to GitHub Container Registry
5961
# if: github.event_name != 'pull_request'
60-
# uses: docker/login-action@v1
62+
# uses: docker/login-action@v1
6163
# with:
6264
# registry: ghcr.io
6365
# username: ${{ github.repository_owner }}

‎.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: E2E Tests
33
on:
44
push:
55
branches:
6-
- 'master'
6+
# - 'master' # commented due to Codefresh convention
77
- 'release-*'
88
pull_request:
99
branches:
10-
- 'master'
10+
# - 'master' # commented due to Codefresh convention
1111
- 'release-*'
1212
workflow_dispatch:
1313
inputs:

‎.github/workflows/go.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: Go
22
on:
33
push:
44
branches:
5-
- "master"
6-
- "release-*"
5+
# - "master"
6+
- "release-*" # Codefresh convention
77
pull_request:
88
branches:
9-
- "master"
9+
# - "master"
10+
- "release-*" # Codefresh convention
1011
jobs:
1112
lint-go:
1213
name: Lint Go code

‎.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
uses: docker/metadata-action@v3
4343
with:
4444
images: |
45-
quay.io/argoproj/argo-rollouts
46-
# ghcr.io/argoproj/argo-rollouts
45+
quay.io/codefresh/argo-rollouts
46+
# ghcr.io/codefresh-io/argo-rollouts
4747
tags: |
4848
type=semver,pattern={{version}},prefix=v,value=${{ github.event.inputs.tag }}
4949
flavor: |
@@ -54,8 +54,8 @@ jobs:
5454
uses: docker/metadata-action@v3
5555
with:
5656
images: |
57-
quay.io/argoproj/kubectl-argo-rollouts
58-
# ghcr.io/argoproj/kubectl-argo-rollouts
57+
quay.io/codefresh/kubectl-argo-rollouts
58+
# ghcr.io/codefresh-io/kubectl-argo-rollouts
5959
tags: |
6060
type=semver,pattern={{version}},prefix=v,value=${{ github.event.inputs.tag }}
6161
flavor: |

‎hack/update-manifests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ if [ ! -z "${IMAGE_TAG}" ]; then
1515
fi
1616

1717
if [ ! -z "${SET_IMAGE_NAMESPACE}" ] || [ ! -z "${SET_IMAGE_TAG}" ]; then
18-
(cd ${SRCROOT}/manifests/base && kustomize edit set image quay.io/argoproj/argo-rollouts${SET_IMAGE_NAMESPACE}${SET_IMAGE_TAG})
19-
(cd ${SRCROOT}/manifests/dashboard-install && kustomize edit set image quay.io/argoproj/kubectl-argo-rollouts${SET_IMAGE_NAMESPACE}${SET_IMAGE_TAG})
18+
(cd ${SRCROOT}/manifests/base && kustomize edit set image quay.io/codefresh/argo-rollouts${SET_IMAGE_NAMESPACE}${SET_IMAGE_TAG})
19+
(cd ${SRCROOT}/manifests/dashboard-install && kustomize edit set image quay.io/codefresh/kubectl-argo-rollouts${SET_IMAGE_NAMESPACE}${SET_IMAGE_TAG})
2020
fi
2121

2222
kust_cmd="kustomize build --load-restrictor LoadRestrictionsNone"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
serviceAccountName: argo-rollouts
2020
containers:
2121
- name: argo-rollouts
22-
image: quay.io/argoproj/argo-rollouts:latest
22+
image: quay.io/codefresh/argo-rollouts:latest
2323
imagePullPolicy: Always
2424
ports:
2525
- containerPort: 8090

‎manifests/base/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ resources:
88
- argo-rollouts-metrics-service.yaml
99
- argo-rollouts-notification-secret.yaml
1010
images:
11-
- name: quay.io/argoproj/argo-rollouts
11+
- name: quay.io/codefresh/argo-rollouts
1212
newTag: latest

‎manifests/dashboard-install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ spec:
125125
app.kubernetes.io/name: argo-rollouts-dashboard
126126
spec:
127127
containers:
128-
- image: quay.io/argoproj/kubectl-argo-rollouts:latest
128+
- image: quay.io/codefresh/kubectl-argo-rollouts:latest
129129
name: argo-rollouts-dashboard
130130
ports:
131131
- containerPort: 3100

‎manifests/dashboard-install/dashboard-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ spec:
1919
serviceAccountName: argo-rollouts-dashboard
2020
containers:
2121
- name: argo-rollouts-dashboard
22-
image: quay.io/argoproj/kubectl-argo-rollouts
22+
image: quay.io/codefresh/kubectl-argo-rollouts
2323
ports:
2424
- containerPort: 3100

0 commit comments

Comments
 (0)