Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Upgrade ksctl core version v1.1.3 -> v1.1.4 #23

Merged
merged 12 commits into from
Apr 29, 2024
Merged

feature: Upgrade ksctl core version v1.1.3 -> v1.1.4 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c14048
initial version bump
dipankardas011 Apr 29, 2024
9b18bf2
feat: added the aws support
dipankardas011 Apr 29, 2024
ca742f0
removed the github workflow for stale
dipankardas011 Apr 29, 2024
a22b90c
feat: improved the scripts for development
dipankardas011 Apr 29, 2024
6642314
improved the test cases for the aws
dipankardas011 Apr 29, 2024
a404539
some fixes to the aws
dipankardas011 Apr 29, 2024
c2aeddb
updates: added improvements
dipankardas011 Apr 29, 2024
fcd3e6d
fix: failing k8s ver
dipankardas011 Apr 29, 2024
038c926
fix: failing mock tests
dipankardas011 Apr 29, 2024
41922cd
fixed the mock test workflow
dipankardas011 Apr 29, 2024
e106374
added missing if condition for the mock test
dipankardas011 Apr 29, 2024
81e147a
patch: improved the logging for ci mock
dipankardas011 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/workflows/stale.yml
View file
Open in desktop

This file was deleted.

135 changes: 112 additions & 23 deletions .github/workflows/test-mock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- 'scripts/**'
- 'go.mod'
- 'go.sum'
types: [ labeled ]
types: [ labeled, opened, synchronize, reopened ]
branches: [ main ]
push:
paths:
Expand All @@ -19,7 +19,14 @@ on:
branches: [ main ]
jobs:
ksctl-cli-windows:
if: ${{ github.event.label.name == 'pr/lgtm' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
if: |
(
github.event.label.name == 'pr/lgtm' ||
contains(github.event.pull_request.labels.*.name, 'pr/lgtm')
) || (
github.event_name == 'push' &&
github.ref == 'refs/heads/main'
)
runs-on: windows-latest
env:
KSCTL_FAKE_FLAG_ENABLED: "1"
Expand All @@ -42,19 +49,25 @@ jobs:
- name: civo create
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe create civo -n demo -r LON1 --nodeSizeMP "g4s.kube.small" --verbose -1 -s local --approve
.\ksctl.exe create ha-civo -n ha-demo --nodeSizeDS "fake.small" --nodeSizeLB "fake.small" --nodeSizeCP "fake.small" --nodeSizeWP "fake.small" -s local -r LON1 --verbose -1 --approve
.\ksctl.exe create civo -n demo -r LON1 --nodeSizeMP "g4s.kube.small" --version 1.27.1 --verbose -1 -s local --approve
.\ksctl.exe create ha-civo -n ha-demo --nodeSizeDS "fake.small" --version 1.27.1 --nodeSizeLB "fake.small" --nodeSizeCP "fake.small" --nodeSizeWP "fake.small" -s local -r LON1 --verbose -1 --approve

- name: azure create
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe create azure -n demo -r fake --nodeSizeMP "fake" -s local --verbose -1 --approve
.\ksctl.exe create ha-azure -n ha-demo --nodeSizeDS "fake" --nodeSizeLB "fake" --nodeSizeCP "fake" --nodeSizeWP "fake" -r fake --verbose -1 -s local --approve
.\ksctl.exe create azure -n demo -r fake --nodeSizeMP "fake" -s local --version 1.27.1 --verbose -1 --approve
.\ksctl.exe create ha-azure -n ha-demo --nodeSizeDS "fake" --version 1.27.1 --nodeSizeLB "fake" --nodeSizeCP "fake" --nodeSizeWP "fake" -r fake --verbose -1 -s local --approve

- name: aws create
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
# .\ksctl.exe create aws -n demo -r fake --nodeSizeMP "fake" --version 1.27.1 -s local --verbose -1 --approve
.\ksctl.exe create ha-aws -n ha-demo --nodeSizeDS "fake" --version 1.27.1 --nodeSizeLB "fake" --nodeSizeCP "fake" --nodeSizeWP "fake" -r fake --verbose -1 -s local --approve

- name: local create
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe create local -n demolocal --verbose -1 -s local --approve
.\ksctl.exe create local -n demolocal --version 1.27.1 --verbose -1 -s local --approve

- name: civo get
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
Expand All @@ -66,6 +79,11 @@ jobs:
run: |
.\ksctl.exe get -s local -p azure

- name: aws get
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe get -s local -p aws

- name: get all
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
Expand All @@ -77,24 +95,35 @@ jobs:
.\ksctl.exe switch -p civo -n demo -s local -r LON1
.\ksctl.exe switch -p ha-civo -n ha-demo -s local -r LON1

- name: aws switch
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
# .\ksctl.exe switch -p aws -n demo -s local -r fake
.\ksctl.exe switch -p ha-aws -n ha-demo -s local -r fake

- name: azure switch
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe switch -p azure -n demo -s local -r fake
.\ksctl.exe switch -p ha-azure -n ha-demo -s local -r fake


- name: civo scale up and down
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe delete ha-civo delete-nodes -n ha-demo --noWP 0 -r LON1 -s local --approve -v -1
.\ksctl.exe create ha-civo add-nodes -n ha-demo --noWP 1 --nodeSizeWP "fake.small" -s local -r LON1 -v -1 --approve
.\ksctl.exe delete ha-civo del-nodes -n ha-demo --noWP 0 -r LON1 -s local --approve -v -1
.\ksctl.exe create ha-civo add-nodes -n ha-demo --noWP 1 --version 1.27.1 --nodeSizeWP "fake.small" -s local -r LON1 -v -1 --approve

- name: azure scale up and down
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe delete ha-azure delete-nodes -n ha-demo --noWP 0 -r fake -s local --approve -v -1
.\ksctl.exe create ha-azure add-nodes -n ha-demo --noWP 1 --nodeSizeWP "fake" -s local -r fake -v -1 --approve
.\ksctl.exe delete ha-azure del-nodes -n ha-demo --noWP 0 -r fake -s local --approve -v -1
.\ksctl.exe create ha-azure add-nodes -n ha-demo --noWP 1 --version 1.27.1 --nodeSizeWP "fake" -s local -r fake -v -1 --approve

- name: aws scale up and down
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
.\ksctl.exe delete ha-aws del-nodes -n ha-demo --noWP 0 -r fake -s local --approve -v -1
.\ksctl.exe create ha-aws add-nodes -n ha-demo --noWP 1 --version 1.27.1 --nodeSizeWP "fake" -s local -r fake -v -1 --approve

- name: civo delete
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
Expand All @@ -109,6 +138,12 @@ jobs:
.\ksctl.exe delete azure -n demo -r fake -s local -v -1 --approve
.\ksctl.exe delete ha-azure -n ha-demo -r fake -s local -v -1 --approve

- name: aws delete
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
# .\ksctl.exe delete aws -n demo -r fake -s local -v -1 --approve
.\ksctl.exe delete ha-aws -n ha-demo -r fake -s local -v -1 --approve

- name: local delete
working-directory: 'C:\Users\runneradmin\AppData\Local\ksctl'
run: |
Expand All @@ -119,10 +154,18 @@ jobs:
matrix:
os: [macos-latest, ubuntu-latest]

if: ${{ github.event.label.name == 'pr/lgtm' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
if: |
(
github.event.label.name == 'pr/lgtm' ||
contains(github.event.pull_request.labels.*.name, 'pr/lgtm')
) || (
github.event_name == 'push' &&
github.ref == 'refs/heads/main'
)
runs-on: ${{ matrix.os }}
env:
KSCTL_FAKE_FLAG_ENABLED: "1"
PS4: '+\[\033[0;33m\](\[\033[0;36m\]${BASH_SOURCE##*/}:${LINENO}\[\033[0;33m\])\[\033[0m\] '
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -135,76 +178,122 @@ jobs:
- name: build ksctl linux
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
set -xe
make install_linux
ksctl version

- name: build ksctl macos
if: ${{ matrix.os == 'macos-latest' }}
run: |
set -xe
make install_macos_intel
ksctl version

- name: civo create
run: |
ksctl create civo -n demo -r LON1 --nodeSizeMP "g4s.kube.small" -s local --verbose -1 --approve
ksctl create ha-civo -n ha-demo --nodeSizeDS "fake.small" -s local --nodeSizeLB "fake.small" --nodeSizeCP "fake.small" --nodeSizeWP "fake.small" -r LON1 --verbose -1 --approve
set -xe
ksctl create civo -n demo -r LON1 --nodeSizeMP "g4s.kube.small" --version 1.27.1 -s local --verbose -1 --approve
ksctl create ha-civo -n ha-demo --nodeSizeDS "fake.small" -s local --version 1.27.1 --nodeSizeLB "fake.small" --nodeSizeCP "fake.small" --nodeSizeWP "fake.small" -r LON1 --verbose -1 --approve

- name: azure create
run: |
ksctl create azure -n demo -r fake --nodeSizeMP "fake" -s local --verbose -1 --approve
ksctl create ha-azure -n ha-demo --nodeSizeDS "fake" -s local --nodeSizeLB "fake" --nodeSizeCP "fake" --nodeSizeWP "fake" -r fake --verbose -1 --approve
set -xe
ksctl create azure -n demo -r fake --nodeSizeMP "fake" -s local --version 1.27.1 --verbose -1 --approve
ksctl create ha-azure -n ha-demo --nodeSizeDS "fake" -s local --nodeSizeLB "fake" --version 1.27.1 --nodeSizeCP "fake" --nodeSizeWP "fake" -r fake --verbose -1 --approve

- name: aws create
run: |
set -xe
# ksctl create aws -n demo -r fake --nodeSizeMP "fake" -s local --version 1.27.1 --verbose -1 --approve
ksctl create ha-aws -n ha-demo --nodeSizeDS "fake" -s local --nodeSizeLB "fake" --version 1.27.1 --nodeSizeCP "fake" --nodeSizeWP "fake" -r fake --verbose -1 --approve

- name: local create
run: |
set -xe
ksctl create local -n demolocal -s local --verbose -1 --approve

- name: civo get
run: |
set -xe
ksctl get -p civo -s local

- name: azure get
run: |
set -xe
ksctl get -p azure -s local

- name: aws get
run: |
set -xe
ksctl get -p aws -s local

- name: all
run: |
set -xe
ksctl get -s local

- name: civo switch
run: |
set -xe
ksctl switch -p civo -n demo -s local -r LON1
ksctl switch -p ha-civo -n ha-demo -s local -r LON1

- name: azure switch
run: |
set -xe
ksctl switch -p azure -n demo -s local -r fake
ksctl switch -p ha-azure -n ha-demo -s local -r fake

- name: aws switch
run: |
set -xe
# ksctl switch -p aws -n demo -s local -r fake
ksctl switch -p ha-aws -n ha-demo -s local -r fake

- name: civo scale up and down
run: |
ksctl delete ha-civo delete-nodes -n ha-demo --noWP 0 -r LON1 -s local --approve -v -1
ksctl create ha-civo add-nodes -n ha-demo --noWP 1 --nodeSizeWP "fake.small" -s local -r LON1 -v -1 --approve
set -xe
ksctl delete ha-civo del-nodes -n ha-demo --noWP 0 -r LON1 -s local --approve -v -1
ksctl create ha-civo add-nodes -n ha-demo --noWP 1 --version 1.27.1 --nodeSizeWP "fake.small" -s local -r LON1 -v -1 --approve

- name: azure scale up and down
run: |
ksctl delete ha-azure delete-nodes -n ha-demo --noWP 0 -s local -r fake --approve -v -1
ksctl create ha-azure add-nodes -n ha-demo --noWP 1 --nodeSizeWP "fake" -s local -r fake -v -1 --approve
set -xe
ksctl delete ha-azure del-nodes -n ha-demo --noWP 0 -s local -r fake --approve -v -1
ksctl create ha-azure add-nodes -n ha-demo --noWP 1 --version 1.27.1 --nodeSizeWP "fake" -s local -r fake -v -1 --approve

- name: aws scale up and down
run: |
set -xe
ksctl delete ha-aws del-nodes -n ha-demo --noWP 0 -s local -r fake --approve -v -1
ksctl create ha-aws add-nodes -n ha-demo --noWP 1 --version 1.27.1 --nodeSizeWP "fake" -s local -r fake -v -1 --approve

- name: civo delete
run: |
set -xe
ksctl delete civo -n demo -r LON1 -s local -v -1 --approve
ksctl delete ha-civo -n ha-demo -r LON1 -s local -v -1 --approve


- name: azure delete
run: |
set -xe
ksctl delete azure -n demo -r fake -s local -v -1 --approve
ksctl delete ha-azure -n ha-demo -r fake -s local -v -1 --approve

- name: aws delete
run: |
set -xe
# ksctl delete aws -n demo -r fake -s local -v -1 --approve
ksctl delete ha-aws -n ha-demo -r fake -s local -v -1 --approve

- name: local delete
run: |
set -xe
ksctl delete local -n demolocal -v -1 -s local --approve

- name: storage provider
run: |
set -xe
ksctl create local -n demolocal -s local -v -1 --approve
ksctl create local -n demolocal -s external-mongo -v -1 --approve || echo "Expected to fail :) due to missing env vars"
ksctl create local -n demolocal -s local123 -v -1 --approve || echo "Expected to fail :) due to invalid provider name"
ksctl create local -n demolocal -s local123 -v -1 --approve || echo "Expected to fail :) due to invalid provider name"
65 changes: 59 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,82 @@ GOOS_LINUX = linux
GOOS_WINDOWS = windows
GOOS_MACOS = darwin

GOARCH_LINUX = amd64
GOARCH_WINDOWS = amd64
GOARCH_LINUX ?= amd64
GOARCH_WINDOWS ?= amd64
GOARCH_MACOS = arm64
GOARCH_MACOS_INTEL = amd64

CURR_TIME = $(shell date +%s)

install_linux:
.PHONY: help
help: ## Display this help.
@awk 'BEGIN {FS = ":.*##"; printf "\n\033[36m _ _ _ \n | | | | | |\n | | _____ ___| |_| |\n | |/ / __|/ __| __| |\n | <\\__ \\ (__| |_| |\n |_|\\_\\___/\\___|\\__|_| \033[0m\n\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

##@ Install (Dev)

.PHONY: install_linux
install_linux: ## Install ksctl
@echo "Started to Install ksctl"
cd scripts && \
env GOOS=${GOOS_LINUX} GOARCH=${GOARCH_LINUX} ./builder.sh

install_macos:
.PHONY: install_macos
install_macos: ## Install ksctl on macos m1,m2,..
@echo "Started to Install ksctl"
cd scripts && \
env GOOS=${GOOS_MACOS} GOARCH=${GOARCH_MACOS} ./builder.sh

install_macos_intel:
.PHONY: install_macos_intel
install_macos_intel: ## Install ksctl on macos intel
@echo "Started to Install ksctl"
cd scripts && \
env GOOS=${GOOS_MACOS} GOARCH=${GOARCH_MACOS_INTEL} ./builder.sh

uninstall:
.PHONY: uninstall
uninstall: ## Uninstall ksctl
@echo "Started to Uninstall ksctl"
cd scripts && \
./uninstall.sh

##@ Linters
.PHONY: golangci-lint
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
$(GOLANGCI_LINT): $(LOCALBIN)
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,${GOLANGCI_LINT_VERSION})

.PHONY: lint
lint: golangci-lint ## Run golangci-lint linter & yamllint
$(GOLANGCI_LINT) run && echo -e "\n=========\n\033[91m✔ PASSED\033[0m\n=========\n" || echo -e "\n=========\n\033[91m✖ FAILED\033[0m\n=========\n"


##@ Dependencies (Controller)

## Location to install dependencies to
LOCALBIN ?= /tmp/bin
$(LOCALBIN):
mkdir -p $(LOCALBIN)

## Tool Binaries
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)

## Tool Versions
GOLANGCI_LINT_VERSION ?= v1.54.2

.PHONY: golangci-lint
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
$(GOLANGCI_LINT): $(LOCALBIN)
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,${GOLANGCI_LINT_VERSION})

# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
# $1 - target path with name of binary (ideally with version)
# $2 - package url which can be installed
# $3 - specific version of package
define go-install-tool
@[ -f $(1) ] || { \
set -e; \
package=$(2)@$(3) ;\
echo "Downloading $${package}" ;\
GOBIN=$(LOCALBIN) go install $${package} ;\
mv "$$(echo "$(1)" | sed "s/-$(3)$$//")" $(1) ;\
}
endef
Loading
Loading