Skip to content

Commit

Permalink
Feat: update installer to fix spot with launch templates (#409)
Browse files Browse the repository at this point in the history
* feat: bump installer to v1.12.0

* feat: disable brew for 0.11.1+

* docs: bump version to 0.11.1

* feat: update also vpc-and-vpn version as well

* fix: revert gcp vpn and vpc ver

* fix: commenting out vsphere and gcp e2e tests
  • Loading branch information
nutellinoit committed Jul 7, 2023
1 parent 9abe923 commit 3e69b5d
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 47 deletions.
52 changes: 26 additions & 26 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ steps:
- bats -t ./automated-tests/integration/vsphere/tests.sh

- &e2e
name: e2e-gcp
name: e2e-aws
image: quay.io/sighup/e2e-furyctl:v1.2.1_v0.3.0_v1.24.9_20.04
pull: always
privileged: true # Required to connect to the VPN
Expand Down Expand Up @@ -146,33 +146,33 @@ steps:
VSPHERE_TEMPLATE_PREFIX:
from_secret: VSPHERE_TEMPLATE_PREFIX
commands:
- echo $${GCP_CREDENTIALS} | base64 -d > $${GCP_CREDENTIALS_PATH}
- export GOOGLE_APPLICATION_CREDENTIALS=$${GCP_CREDENTIALS_PATH}
- bats -t ./automated-tests/e2e-tests/gcp-gke/tests.sh
- bats -t ./automated-tests/e2e-tests/aws-eks/tests.sh
when:
event:
- tag

- <<: *e2e
name: e2e-aws
commands:
- bats -t ./automated-tests/e2e-tests/aws-eks/tests.sh

- <<: *e2e
name: e2e-vsphere
commands:
- bats -t ./automated-tests/e2e-tests/vsphere/tests.sh

- <<: *e2e
name: e2e-vsphere-destroy
depends_on:
- e2e-vsphere
failure: ignore
commands:
- echo " Our vsphere environment is not so stable"
- echo " The destroy phase fails randomly because of disconnection events between vsphere nodes and the API"
- echo " Ignore errors on this step"
- bats -t ./automated-tests/e2e-tests/vsphere/tests-destroy.sh
# - <<: *e2e
# name: e2e-gcp
# commands:
# - echo $${GCP_CREDENTIALS} | base64 -d > $${GCP_CREDENTIALS_PATH}
# - export GOOGLE_APPLICATION_CREDENTIALS=$${GCP_CREDENTIALS_PATH}
# - bats -t ./automated-tests/e2e-tests/gcp-gke/tests.sh

# - <<: *e2e
# name: e2e-vsphere
# commands:
# - bats -t ./automated-tests/e2e-tests/vsphere/tests.sh

# - <<: *e2e
# name: e2e-vsphere-destroy
# depends_on:
# - e2e-vsphere
# failure: ignore
# commands:
# - echo " Our vsphere environment is not so stable"
# - echo " The destroy phase fails randomly because of disconnection events between vsphere nodes and the API"
# - echo " Ignore errors on this step"
# - bats -t ./automated-tests/e2e-tests/vsphere/tests-destroy.sh

- name: build-release
image: ghcr.io/goreleaser/goreleaser:v1.9.2
Expand All @@ -184,8 +184,8 @@ steps:
- integration-aws-eks
- integration-vsphere
- e2e-aws
- e2e-gcp
- e2e-vsphere
# - e2e-gcp
# - e2e-vsphere
environment:
CGO_ENABLED: 0
GITHUB_TOKEN:
Expand Down
36 changes: 18 additions & 18 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,21 @@ release:
name: furyctl
name_template: '{{ .Tag }}'
prerelease: auto
brews:
- name: furyctl
tap:
owner: sighupio
name: homebrew-furyctl
skip_upload: auto
folder: Formula
homepage: 'https://gihub.com/sighupio/furyctl'
description: 'Furyctl binary'
conflicts:
- furyctl
test: |
system "#{bin}/furyctl"
install: |
bin.install 'furyctl'
ids:
- furyctl-darwin-tgz
- furyctl-linux-tgz
#brews:
# - name: furyctl
# tap:
# owner: sighupio
# name: homebrew-furyctl
# skip_upload: auto
# folder: Formula
# homepage: 'https://gihub.com/sighupio/furyctl'
# description: 'Furyctl binary'
# conflicts:
# - furyctl
# test: |
# system "#{bin}/furyctl"
# install: |
# bin.install 'furyctl'
# ids:
# - furyctl-darwin-tgz
# - furyctl-linux-tgz
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Check that everything is working correctly with `furyctl version`:

```bash
furyctl version
INFO[0000] Furyctl version 0.10.0
INFO[0000] Furyctl version 0.11.1
```

> 💡 **TIP**
Expand Down
2 changes: 1 addition & 1 deletion data/provisioners/bootstrap/aws/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ terraform {
}

module "vpc-and-vpn" {
source = "github.com/sighupio/fury-eks-installer//modules/vpc-and-vpn?ref=v1.11.0"
source = "github.com/sighupio/fury-eks-installer//modules/vpc-and-vpn?ref=v1.11.1"

name = var.name
network_cidr = var.network_cidr
Expand Down
2 changes: 1 addition & 1 deletion data/provisioners/cluster/eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
}

module "fury" {
source = "github.com/sighupio/fury-eks-installer//modules/eks?ref=v1.11.0"
source = "github.com/sighupio/fury-eks-installer//modules/eks?ref=v1.11.1"

cluster_name = var.cluster_name
cluster_version = var.cluster_version
Expand Down

0 comments on commit 3e69b5d

Please sign in to comment.