Skip to content

Commit

Permalink
chore: cleanup workflows (#245)
Browse files Browse the repository at this point in the history
* workflow cleanip

* depbot

* adjust codeowners

* quotes & underscores
  • Loading branch information
jamiezieziula authored Sep 27, 2023
1 parent ff0805a commit 5a7007f
Show file tree
Hide file tree
Showing 12 changed files with 119 additions and 234 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @gabcoyne @PrefectHQ/platform
* @PrefectHQ/platform
6 changes: 3 additions & 3 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
- package-ecosystem: github-actions
directory: /
schedule:
interval: "monthly"
interval: weekly
100 changes: 21 additions & 79 deletions .github/updatecli/manifest-major.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,106 +3,48 @@ sources:
common:
kind: helmchart
spec:
url: "https://charts.bitnami.com/bitnami"
name: "common"
version: "*.*.*"
url: https://charts.bitnami.com/bitnami
name: common
versionFilter:
kind: semver
pattern: 2.x.x
sourceid: common
postgresql:
kind: helmchart
spec:
url: "https://charts.bitnami.com/bitnami"
name: "postgresql"
version: "*.*.*"
sourceid: postgresql
helm:
kind: githubRelease
spec:
owner: helm
repository: helm
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
versionFilter:
kind: semver
pattern: "x.x.x"
transformers:
- trimprefix: "v"
kind:
kind: githubRelease
spec:
owner: kubernetes-sigs
repository: kind
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
url: https://charts.bitnami.com/bitnami
name: postgresql
versionFilter:
kind: semver
pattern: "x.x.x"
pattern: 11.x.x
sourceid: postgresql
conditions: {}
targets:
agent-common:
agent_common:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-agent/Chart.yaml"
key: "dependencies[0].version"
file: charts/prefect-agent/Chart.yaml
key: dependencies[0].version
sourceid: common
server-common:
server_common:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-server/Chart.yaml"
key: "dependencies[0].version"
file: charts/prefect-server/Chart.yaml
key: dependencies[0].version
sourceid: common
worker-common:
worker_common:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-worker/Chart.yaml"
key: "dependencies[0].version"
file: charts/prefect-worker/Chart.yaml
key: dependencies[0].version
sourceid: common
server-postgresql:
server_postgresql:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-server/Chart.yaml"
key: "dependencies[1].version"
file: charts/prefect-server/Chart.yaml
key: dependencies[1].version
sourceid: postgresql
helm-agent:
name: bump helm version
kind: yaml
spec:
file: ".github/workflows/agent-lint-and-test.yaml"
key: "jobs.lint-test.steps[1].with.version"
sourceid: helm
helm-server:
name: bump helm version
kind: yaml
spec:
file: ".github/workflows/server-lint-and-test.yaml"
key: "jobs.lint-test.steps[1].with.version"
sourceid: helm
helm-worker:
name: bump helm version
kind: yaml
spec:
file: ".github/workflows/worker-lint-and-test.yaml"
key: "jobs.lint-test.steps[1].with.version"
sourceid: helm
kind-agent:
name: bump kind version
kind: yaml
spec:
file: ".github/workflows/agent-lint-and-test.yaml"
key: "jobs.lint-test.steps[4].with.version"
sourceid: kind
kind-server:
name: bump kind version
kind: yaml
spec:
file: ".github/workflows/server-lint-and-test.yaml"
key: "jobs.lint-test.steps[4].with.version"
sourceid: kind
kind-worker:
name: bump kind version
kind: yaml
spec:
file: ".github/workflows/worker-lint-and-test.yaml"
key: "jobs.lint-test.steps[4].with.version"
sourceid: kind
79 changes: 21 additions & 58 deletions .github/updatecli/manifest-minor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,85 +3,48 @@ sources:
common:
kind: helmchart
spec:
url: "https://charts.bitnami.com/bitnami"
name: "common"
version: "2.*.*"
url: https://charts.bitnami.com/bitnami
name: common
versionFilter:
kind: semver
pattern: 2.x.x
sourceid: common
postgresql:
kind: helmchart
spec:
url: "https://charts.bitnami.com/bitnami"
name: "postgresql"
version: "11.*.*"
sourceid: postgresql
helm:
kind: githubRelease
spec:
owner: helm
repository: helm
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
versionFilter:
kind: semver
pattern: "3.x.x"
transformers:
- trimprefix: "v"
kind:
kind: githubRelease
spec:
owner: kubernetes-sigs
repository: kind
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
url: https://charts.bitnami.com/bitnami
name: postgresql
versionFilter:
kind: semver
pattern: "x.x.x"
pattern: 11.x.x
sourceid: postgresql
conditions: {}
targets:
agent-common:
agent_common:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-agent/Chart.yaml"
key: "dependencies[0].version"
file: charts/prefect-agent/Chart.yaml
key: dependencies[0].version
sourceid: common
server-common:
server_common:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-server/Chart.yaml"
key: "dependencies[0].version"
file: charts/prefect-server/Chart.yaml
key: dependencies[0].version
sourceid: common
worker-common:
worker_common:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-worker/Chart.yaml"
key: "dependencies[0].version"
file: charts/prefect-worker/Chart.yaml
key: dependencies[0].version
sourceid: common
server-postgresql:
server_postgresql:
name: bump chart dependencies
kind: yaml
spec:
file: "charts/prefect-server/Chart.yaml"
key: "dependencies[1].version"
file: charts/prefect-server/Chart.yaml
key: dependencies[1].version
sourceid: postgresql
helm-agent:
name: bump helm version
kind: yaml
spec:
file: ".github/workflows/agent-lint-and-test.yaml"
key: "jobs.lint-test.steps[4].with.version"
sourceid: kind
helm-server:
name: bump helm version
kind: yaml
spec:
file: ".github/workflows/server-lint-and-test.yaml"
key: "jobs.lint-test.steps[4].with.version"
sourceid: kind
helm-worker:
name: bump helm version
kind: yaml
spec:
file: ".github/workflows/worker-lint-and-test.yaml"
key: "jobs.lint-test.steps[4].with.version"
sourceid: kind
20 changes: 13 additions & 7 deletions .github/workflows/agent-lint-and-test.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
name: Lint and Test Prefect Agent Chart
on:

"on":
pull_request:
paths:
- .github/workflows/agent-lint-and-test.yaml
- .github/linters/agent-ct.yaml
- 'charts/prefect-agent/**'
- charts/prefect-agent/**

jobs:
lint-test:
lint_test:
name: "lint-test (${{ matrix.kubernetes }})"
runs-on: ubuntu-latest
strategy:
Expand All @@ -16,25 +18,29 @@ jobs:
- "1.26.3"
- "1.27.0"
fail-fast: false

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Helm
uses: azure/[email protected]
with:
version: v3.11.2

- name: Set up chart-testing
uses: helm/[email protected]

- name: Run chart-testing (lint)
run: ct lint --config .github/linters/agent-ct.yaml

- name: Create kind cluster
uses: helm/[email protected]
with:
version: v0.20.0
node_image: "kindest/node:v${{ matrix.kubernetes }}"

- name: Create API Secret for Agent Chart
run: |
kubectl create ns prefect
kubectl create secret generic prefect-api-key --from-literal=key=${{ secrets.PREFECT_CLOUD_API_KEY }} -n prefect
- name: Run chart-testing (install)
run: ct install --config .github/linters/agent-ct.yaml --helm-extra-set-args "--set=agent.config.workQueueName=test-helm --set=agent.cloudApiConfig.accountId=${{ secrets.PREFECT_CLOUD_ACCOUNT_ID }} --set=agent.cloudApiConfig.workspaceId=${{ secrets.PREFECT_CLOUD_WORKSPACE_ID }}"
4 changes: 1 addition & 3 deletions .github/workflows/helm-release.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Release Helm Chart

on:
"on":
push:
tags:
# 2023.9.1, but not 2023.09.01
Expand Down Expand Up @@ -41,8 +41,6 @@ jobs:
- name: Set up Helm
uses: azure/[email protected]
with:
version: v3.9.2

- name: Prepare GPG key for signing
run: |
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/server-lint-and-test.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
name: Lint and Test Prefect Server Chart
on:

"on":
pull_request:
paths:
- .github/workflows/server-lint-and-test.yaml
- .github/linters/server-ct.yaml
- 'charts/prefect-server/**'
- charts/prefect-server/**

jobs:
lint-test:
lint_test:
name: "lint-test (${{ matrix.kubernetes }})"
runs-on: ubuntu-latest
strategy:
Expand All @@ -16,21 +18,24 @@ jobs:
- "1.26.3"
- "1.27.0"
fail-fast: false

steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up Helm
uses: azure/[email protected]
with:
version: v3.11.2

- name: Set up chart-testing
uses: helm/[email protected]

- name: Run chart-testing (lint)
run: ct lint --config .github/linters/server-ct.yaml

- name: Create kind cluster
uses: helm/[email protected]
with:
version: v0.20.0
node_image: "kindest/node:v${{ matrix.kubernetes }}"

- name: Run chart-testing (install)
run: ct install --config .github/linters/server-ct.yaml --helm-extra-set-args "--set=postgresql.auth.password=TESTING"
Loading

0 comments on commit 5a7007f

Please sign in to comment.