Skip to content

Commit 064f266

Browse files
update (#441)
1 parent cd708fd commit 064f266

File tree

3 files changed

+22
-49
lines changed

3 files changed

+22
-49
lines changed

.github/workflows/pull_request.yaml

+5-32
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-latest
1717
name: Build
18-
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
18+
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
1919
steps:
2020
- name: Check out code
2121
uses: actions/checkout@v4
2222
with:
2323
ref: ${{github.event.pull_request.head.sha}}
24-
24+
2525
# Setting up helm binary
2626
- name: Set up Helm
2727
uses: azure/setup-helm@v3
@@ -64,7 +64,7 @@ jobs:
6464
# run: |
6565
# kind create cluster
6666
# kubectl cluster-info
67-
67+
6868
# - name: Test
6969
# run: make test
7070

@@ -74,7 +74,7 @@ jobs:
7474
sha=${{ github.event.pull_request.head.sha }}
7575
tag="SNAPSHOT-PR-${{ github.event.pull_request.number }}-${sha:0:8}"
7676
echo "GIT_TAG=$(echo ${tag})" >> $GITHUB_OUTPUT
77-
77+
7878
- name: Set up QEMU
7979
uses: docker/setup-qemu-action@v3
8080

@@ -103,30 +103,3 @@ jobs:
103103
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
104104
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
105105
org.opencontainers.image.revision=${{ github.sha }}
106-
107-
# - name: Comment on PR
108-
# uses: mshick/add-pr-comment@v2
109-
# env:
110-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111-
# with:
112-
# message: '@${{ github.actor }} Image is available for testing. `docker pull ${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}`'
113-
# allow-repeats: true
114-
115-
# - name: Notify Failure
116-
# if: failure()
117-
# uses: mshick/add-pr-comment@v2
118-
# env:
119-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120-
# with:
121-
# message: '@${{ github.actor }} Yikes! You better fix it before anyone else finds out! [Build](https://github.com/${{ github.repository }}/commit/${{ github.event.pull_request.head.sha }}/checks) has Failed!'
122-
# allow-repeats: true
123-
124-
# - name: Notify Slack
125-
# uses: 8398a7/action-slack@v3
126-
# if: always() # Pick up events even if the job fails or is canceled.
127-
# with:
128-
# status: ${{ job.status }}
129-
# fields: repo,author,action,eventName,ref,workflow
130-
# env:
131-
# GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
132-
# SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}

.github/workflows/push.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
id: generate_tag
7171
uses: anothrNick/[email protected]
7272
env:
73-
GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
73+
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
7474
WITH_V: true
7575
DEFAULT_BUMP: patch
7676
DRY_RUN: true
@@ -87,11 +87,11 @@ jobs:
8787
registry: ${{env.REGISTRY}}
8888
username: stakater-user
8989
password: ${{secrets.GITHUB_TOKEN}}
90-
90+
9191
- name: Generate image repository path for ghcr registry
9292
run: |
9393
echo GHCR_IMAGE_REPOSITORY=${{env.REGISTRY}}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
94-
94+
9595
- name: Build and push image to ghcr registry
9696
uses: docker/build-push-action@v5
9797
with:
@@ -108,7 +108,7 @@ jobs:
108108
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
109109
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
110110
org.opencontainers.image.revision=${{ github.sha }}
111-
111+
112112
- name: Login to DockerHub Registry
113113
uses: docker/login-action@v3
114114
with:
@@ -135,7 +135,7 @@ jobs:
135135
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
136136
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
137137
org.opencontainers.image.revision=${{ github.sha }}
138-
138+
139139
##############################
140140
## Add steps to generate required artifacts for a release here(helm chart, operator manifest etc.)
141141
##############################
@@ -145,7 +145,7 @@ jobs:
145145
id: generate_operator_tag
146146
uses: anothrNick/[email protected]
147147
env:
148-
GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
148+
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
149149
WITH_V: false
150150
DEFAULT_BUMP: patch
151151
DRY_RUN: true
@@ -163,7 +163,7 @@ jobs:
163163
branch: master
164164
repository: stakater-charts
165165
target_dir: docs
166-
token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
166+
token: ${{ secrets.GHCR_TOKEN }}
167167
charts_dir: deployments/kubernetes/chart/
168168
charts_url: ${{ env.HELM_REGISTRY_URL }}
169169
owner: stakater
@@ -179,30 +179,30 @@ jobs:
179179
--set forecastle.config.namespaceSelector.any=true > deployments/kubernetes/forecastle.yaml
180180
helm template forecastle deployments/kubernetes/chart/forecastle/ --include-crds --output-dir deployments/kubernetes/manifests/ \
181181
--set forecastle.service.expose="true" --set forecastle.route.enabled=true --set forecastle.route.tls.termination=reencrypt \
182-
--set forecastle.config.namespaceSelector.any=true --set forecastle.config.crdEnabled=true
183-
mv deployments/kubernetes/manifests/forecastle/templates/* deployments/kubernetes/manifests/
184-
mv deployments/kubernetes/manifests/forecastle/crds/* deployments/kubernetes/manifests/
182+
--set forecastle.config.namespaceSelector.any=true --set forecastle.config.crdEnabled=true
183+
mv deployments/kubernetes/manifests/forecastle/templates/* deployments/kubernetes/manifests/
184+
mv deployments/kubernetes/manifests/forecastle/crds/* deployments/kubernetes/manifests/
185185
rm -r deployments/kubernetes/manifests/forecastle
186186
187187
# Commit back changes
188188
- name: Commit files
189189
run: |
190190
git config --local user.email "[email protected]"
191191
git config --local user.name "stakater-user"
192-
git status
192+
git status
193193
git add .
194194
git commit -m "[skip-ci] Update artifacts" -a
195-
195+
196196
- name: Push changes
197197
uses: ad-m/github-push-action@master
198198
with:
199-
github_token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
199+
github_token: ${{ secrets.PUBLISH_TOKEN }}
200200
branch: ${{ github.ref }}
201201

202202
- name: Push Latest Tag
203203
uses: anothrNick/[email protected]
204204
env:
205-
GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
205+
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
206206
WITH_V: true
207207
DEFAULT_BUMP: patch
208208

@@ -213,5 +213,5 @@ jobs:
213213
status: ${{ job.status }}
214214
fields: repo,author,action,eventName,ref,workflow
215215
env:
216-
GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
216+
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
217217
SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}

.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
version: latest
2929
args: release --clean
3030
env:
31-
GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
31+
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
3232

3333
- name: Notify Slack
3434
uses: 8398a7/action-slack@v3
@@ -37,5 +37,5 @@ jobs:
3737
status: ${{ job.status }}
3838
fields: repo,author,action,eventName,ref,workflow
3939
env:
40-
GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
40+
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
4141
SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}

0 commit comments

Comments
 (0)