Add gofmt check and verify CRD codegen as part of CI testing

This commit is contained in:
Stefan Prodan
2018-09-30 12:38:18 +03:00
parent 217ad6ef19
commit d331d908a8
4 changed files with 25 additions and 9 deletions
+1
View File
@@ -10,3 +10,4 @@
# Output of the go coverage tool, specifically when used with LiteIDE
*.out
.DS_Store
-1
View File
@@ -15,7 +15,6 @@ addons:
script:
- set -e
- make test
- make verify-codegen
- make build
after_success:
+20 -4
View File
@@ -2,7 +2,7 @@ TAG?=latest
VERSION?=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"')
VERSION_MINOR:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"' | rev | cut -d'.' -f2- | rev)
PATCH:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"' | awk -F. '{print $$NF}')
SOURCE_DIRS = cmd pkg/apis pkg/controller pkg/server pkg/logging pkg/version
run:
go run cmd/steerer/* -kubeconfig=$$HOME/.kube/config -log-level=debug -metrics-server=https://prometheus.istio.weavedx.com
@@ -12,12 +12,18 @@ build:
push:
docker push stefanprodan/steerer:$(TAG)
test:
go test ./...
fmt:
gofmt -l -s -w $(SOURCE_DIRS)
verify-codegen:
test-fmt:
gofmt -l -s $(SOURCE_DIRS) | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
test-codegen:
./hack/verify-codegen.sh
test: test-fmt test-codegen
go test ./...
helm-package:
cd chart/ && helm package steerer/
mv chart/*.tgz docs/
@@ -50,4 +56,14 @@ dev-up: version-up
docker push stefanprodan/steerer:$(VERSION)
helm upgrade --install steerer ./chart/steerer --namespace=istio-system
release:
git tag $(VERSION)
git push origin $(VERSION)
release-set: fmt version-set helm-package
git add .
git commit -m "Release $(VERSION)"
git push origin master
git tag $(VERSION)
git push origin $(VERSION)
+4 -4
View File
@@ -161,7 +161,7 @@ func (c *Controller) checkRolloutStatus(r *rolloutv1.Rollout, canaryVersion stri
}
r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
if err != nil {
c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
return false
}
return true
@@ -179,7 +179,7 @@ func (c *Controller) checkRolloutStatus(r *rolloutv1.Rollout, canaryVersion stri
}
r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
if err != nil {
c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
return false
}
return true
@@ -193,7 +193,7 @@ func (c *Controller) updateRolloutStatus(r *rolloutv1.Rollout, status string) bo
r.Status.State = status
r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
if err != nil {
c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
return false
}
return true
@@ -204,7 +204,7 @@ func (c *Controller) updateRolloutFailedChecks(r *rolloutv1.Rollout, val int) bo
r.Status.FailedChecks = val
r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
if err != nil {
c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
return false
}
return true