Skip to content

Commit

Permalink
Merge pull request #27 from B-urb/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
B-urb authored Feb 29, 2024
2 parents 0f9aa4e + 2de8a23 commit 8e948c6
Show file tree
Hide file tree
Showing 15 changed files with 3,461 additions and 509 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ jobs:
matrix:
workdir: [ l1, l2 ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3.5.0
- uses: actions/checkout@v4
- uses: actions/setup-node@v4.0.2
with:
node-version: '19.9.0'
- uses: actions-hub/kubectl@v1.27.2
- uses: actions-hub/kubectl@v1.29.2
env:
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
with:
args: get pods
- run: npm install
working-directory: ${{ matrix.workdir }}
- uses: pulumi/actions@v4
- uses: pulumi/actions@v5
with:
command: preview
work-dir: ${{ matrix.workdir }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
name: Update
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3.5.0
- uses: actions/checkout@v4
- uses: actions/setup-node@v4.0.2
with:
node-version-file: package.json
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-region: ${{ secrets.AWS_REGION }}
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# for all branches except the master.
# Only for master branch merges, the main `pulumi` job is executed automatically.
image:
name: pulumi/pulumi:3.53.1
name: pulumi/pulumi:3.107.0
entrypoint:
- '/usr/bin/env'
- 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
Expand Down
4 changes: 2 additions & 2 deletions flux-operator/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const ns = deployNamespaceList[0]
stack: "hetzner",
projectRepo: "https://github.com/B-urb/infrastructure",
repoDir: "/l1",
branch: "development",
branch: "master",
retryOnUpdateConflict: true,
destroyOnFinalize: true,
}
Expand All @@ -177,7 +177,7 @@ const ns = deployNamespaceList[0]
stack: "hetzner",
projectRepo: "https://github.com/B-Urb/infrastructure",
repoDir: "/l2",
branch: "development",
branch: "master",
prerequisites: [
{name: "l1"}
],
Expand Down
30 changes: 19 additions & 11 deletions flux-operator/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flux-operator/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "deploy-operator-ts",
"devDependencies": {
"@types/node": "^14"
"@types/node": "^20.0.0"
},
"dependencies": {
"@pulumi/pulumi": "^3.0.0",
"@pulumi/kubernetes": "^3.0.0",
"@pulumi/kubernetes": "^4.0.0",
"@pulumi/kubernetesx": "^0.1.5"
}
}
Loading

0 comments on commit 8e948c6

Please sign in to comment.