Skip to content

Commit

Permalink
Merge branch 'main' into brMerge
Browse files Browse the repository at this point in the history
  • Loading branch information
suket22 committed May 25, 2022
2 parents 507778f + 30c1607 commit 9bdb35f
Show file tree
Hide file tree
Showing 129 changed files with 8,427 additions and 1,412 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/pr-approval-test1.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/pr-approval-test2.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Create Release
on:
push:
tags: ['v*']
permissions:
id-token: write
contents: read
jobs:
release:
if: github.repository == 'aws/karpenter'
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ coverage.html
# Common in OSs and IDEs
.idea
.DS_Store

# Go Benchmarking
*.cpuprofile
*.heapprofile
3 changes: 2 additions & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ linters-settings:
local-prefixes: github.com/aws/karpenter

issues:
fix: true
fix: true
exclude: ['declaration of "(err|ctx)" shadows declaration at']
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ deflake:
for i in {1..10}; do make strongertests || exit 1; done
ginkgo -r -race -tags random_test_delay

battletest: strongertests
battletest: strongertests
go tool cover -html coverage.out -o coverage.html

verify: codegen ## Verify code. Includes dependencies, linting, formatting, etc
Expand All @@ -65,7 +65,7 @@ apply: ## Deploy the controller from the current state of your git repository in
install: ## Deploy the latest released version into your ~/.kube/config cluster
@echo Upgrading to $(shell grep version charts/karpenter/Chart.yaml)
helm upgrade --install karpenter charts/karpenter --namespace karpenter \
$(HELM_OPTS)
$(HELM_OPTS)

delete: ## Delete the controller from your ~/.kube/config cluster
helm uninstall karpenter --namespace karpenter
Expand Down
Loading

0 comments on commit 9bdb35f

Please sign in to comment.