Skip to content

Commit

Permalink
Merge pull request #231 from brave-intl/upstream-upgrade
Browse files Browse the repository at this point in the history
Upstream update
  • Loading branch information
tarikdem authored Oct 24, 2023
2 parents e9f7a57 + 194c1d1 commit 101c704
Show file tree
Hide file tree
Showing 329 changed files with 14,159 additions and 6,310 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
!.git
!.goreleaser*
!.golangci*
!.mockery.yaml
!build/scripts
!cmd
!examples
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Before you start writing:
2. Download the latest version of eksctl to see whether the problem has already been fixed.
For more information on how to open a bug report in eksctl, please refer to our issue submission guide.
https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md#opening-issues
https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#opening-issues
-->

### What were you trying to accomplish?
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ In order to help us process this request faster, please provide as much detail a
Before creating a feature request, please search existing issues to see if this request has already been made. If there is a similar feature request please up-vote it and/or add your comments to it instead.
For more information on how to contribute to eksctl, please refer to our contributing docs.
https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md#opening-issues
https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#opening-issues
-->

### What feature/behavior/change do you want?
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/request-for-help.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Before creating a new request for help, please search existing issue to see if y
If there is a similar feature request please up-vote it and/or add your comments to it instead
For more information on how to request help on eksctl, please refer to our community docs.
https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md#opening-issues
https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#opening-issues
-->

### What help do you need?
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-identity/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ inputs:
name:
description: "Git config name"
required: false
default: "weaveworksbot"
default: "eksctl-bot"
email:
description: "Git config email"
required: false
default: "weaveworksbot@users.noreply.github.com"
default: "53547694+eksctl-bot@users.noreply.github.com"
outputs: {}
runs:
using: "composite"
Expand Down
2 changes: 1 addition & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ template: |
Weaveworks would like to sincerely thank:
$CONTRIBUTORS
replacers:
- search: '/@(Himangini|TiberiuGC|A-Hilaly|yuxiang-zhang|cPu1|weaveworksbot|dependabot(?:\[bot\])?)(?:,| |$)/gm'
- search: '/@(Himangini|TiberiuGC|a-hilaly|yuxiang-zhang|cPu1|eksctl-bot|dependabot(?:\[bot\])?)(?:,| |$)/gm'
replace: ''
exclude-labels:
- 'skip-release-notes'
30 changes: 24 additions & 6 deletions .github/workflows/build-all-distros-nightly.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,47 @@
name: Build all distros
on:
schedule:
- cron: '0 9 * * *'
- cron: '0 9 * * 1-5'
workflow_dispatch: {}

jobs:
build-all-distros:
name: build all distros
runs-on: ubuntu-latest
steps:
# Clean unnecessary files to save disk space
- name: clean unncessary files to save space
run: |
docker rmi `docker images -q`
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/sudo apt/sources.list.d
sudo apt -y autoremove --purge
sudo apt -y autoclean
sudo apt clean
rm --recursive --force "$AGENT_TOOLSDIRECTORY"
df -h
# Free up disk space on Ubuntu
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8 #v1.3.0
with:
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
tool-cache: false
large-packages: true
swap-storage: true
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
with:
fetch-depth: 0
- name: Cache go-build and mod
uses: actions/cache@v3
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
with:
path: |
~/.cache/go-build/
~/go/pkg/mod/
key: ${{ hashFiles('go.sum') }}
- name: Setup Go
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Setup deps
run: |
make install-build-deps
Expand All @@ -35,7 +53,7 @@ jobs:
make build-all
- name: slack on failure
if: failure()
uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0
with:
slack_token: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }}
message: ":ahhhhhhhhh: build-all-distros has failed"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/cache-dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
name: Cache Dependencies
on:
push:
branches:
Expand All @@ -9,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cache Go modules
uses: actions/cache@v3
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
with:
path: |
~/.cache/go-build/
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/dependabot-bundler.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/docker-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 #4.6.0
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #5.0.0
with:
images: weaveworks/eksctl
- name: Log in to Docker Hub
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d #v3.0.0
with:
username: weaveworkseksctlci
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: Build and push Docker image
uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf #4.1.0
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #5.0.0
with:
context: .
push: true
Expand Down
52 changes: 52 additions & 0 deletions .github/workflows/ecr-publish-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Publish ECR eksctl-build image

on: workflow_dispatch

permissions:
id-token: write
contents: read

jobs:
build-and-push-to-registry:
name: Build and push container image
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
with:
aws-region: us-east-1
role-duration-seconds: 7200
role-session-name: eksctl-build-ecr-publisher
role-to-assume: ${{ secrets.ECR_PUBLISH_ROLE_ARN }}

- name: Login to Amazon ECR Public
id: login-ecr-public
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v1
with:
registry-type: public

- name: Cache go-build and mod
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
with:
path: |
~/.cache/go-build/
~/go/pkg/mod/
key: go-${{ hashFiles('go.sum') }}
restore-keys: |
go-
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.20.x

- name: Setup deps
run: |
make install-build-deps
- name: Build and push image
run: |
PATH=$PATH:$(go env GOPATH)/bin make -f Makefile.docker push-build-image
49 changes: 49 additions & 0 deletions .github/workflows/ecr-publish.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Publish ECR image

on:
release:
types: [published]

permissions:
id-token: write
contents: read

jobs:
build-and-push-to-registry:
name: Build and push container image
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
with:
aws-region: us-east-1
role-duration-seconds: 7200
role-session-name: eksctl-ecr-publisher
role-to-assume: ${{ secrets.ECR_PUBLISH_ROLE_ARN }}

- name: Login to Amazon ECR Public
id: login-ecr-public
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v1
with:
registry-type: public

- name: Extract metadata (tags, labels)
id: meta
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #5.0.0
env:
REGISTRY: ${{ steps.login-ecr-public.outputs.registry }}
REGISTRY_ALIAS: eksctl
REPOSITORY: eksctl
with:
images: ${{ env.REGISTRY }}/${{ env.REGISTRY_ALIAS }}/${{ env.REPOSITORY }}

- name: Build and push container image to ECR
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #5.0.0
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
1 change: 1 addition & 0 deletions .github/workflows/exclude-file.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ creating-and-managing-clusters
schema.js
weave-community.slack.com
netlify.com
slack.k8s.io
6 changes: 3 additions & 3 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/first-interaction@v1
- uses: actions/first-interaction@1dbfe1ba5525b8257e1f259b09745bee346d62d8 #v1.2.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: 'Hello ${{ github.event.issue.user.login }} :wave: Thank you for opening an issue in `eksctl` project. The team will review the issue and aim to respond within 1-5 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/weaveworks/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)'
pr-message: 'Hello ${{ github.event.pull_request.user.login }} :wave: Thank you for opening a Pull Request in `eksctl` project. The team will review the Pull Request and aim to respond within 1-10 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/weaveworks/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)'
issue-message: 'Hello ${{ github.event.issue.user.login }} :wave: Thank you for opening an issue in `eksctl` project. The team will review the issue and aim to respond within 1-5 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/eksctl-io/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)'
pr-message: 'Hello ${{ github.event.pull_request.user.login }} :wave: Thank you for opening a Pull Request in `eksctl` project. The team will review the Pull Request and aim to respond within 1-10 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/eksctl-io/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)'
8 changes: 4 additions & 4 deletions .github/workflows/link-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
matrix:
python-version: [3.9]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 #v4.7.1
with:
python-version: ${{ matrix.python-version }}
- name: Setup Go
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Install doc dependencies
run: make install-site-deps
- name: Build docs for link check
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/publish-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
with:
token: ${{ secrets.WEAVEWORKSBOT_TOKEN }}
token: ${{ secrets.EKSCTLBOT_TOKEN }}
fetch-depth: 0
- name: Setup Go
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Cache go-build and mod
uses: actions/cache@v3
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
with:
path: |
~/.cache/go-build/
~/go/pkg/mod/
key: go-${{ hashFiles('go.sum') }}
restore-keys: |
go-
- name: Setup identity as weaveworksbot
- name: Setup identity as eksctl-bot
uses: ./.github/actions/setup-identity
with:
token: "${{ secrets.WEAVEWORKSBOT_TOKEN }}"
token: "${{ secrets.EKSCTLBOT_TOKEN }}"
- name: Trigger Netlify deployment
run: make publish-docs
- name: slack on success
if: success()
uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0
with:
slack_token: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }}
message: ":tada: Docs published successfully :tada:"
Expand All @@ -44,7 +44,7 @@ jobs:
verbose: true
- name: slack on failure
if: failure()
uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0
with:
slack_token: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }}
message: ":ahhhhhhhhh: Docs publishing failed."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release-candidate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ jobs:
isReleaseCandidate: true
name: release candidate
secrets:
githubToken: ${{ secrets.WEAVEWORKSBOT_TOKEN }}
githubToken: ${{ secrets.EKSCTLBOT_TOKEN }}
slackToken: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }}
Loading

0 comments on commit 101c704

Please sign in to comment.