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

fix: nil pointer in GC #2055

Merged
merged 3 commits into from
Jan 24, 2020
Merged

fix: nil pointer in GC #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39903cd
fix: nil pointer in GC
alexec Jan 24, 2020
351f1a1
removed file
alexec Jan 24, 2020
ca4b095
ci: run no-db
alexec Jan 24, 2020
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
9 changes: 9 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,14 @@ jobs:
- store_artifacts:
path: test-results
destination: .
e2e-no-db:
working_directory: /home/circleci/.go_workspace/src/github.com/argoproj/argo
machine:
image: ubuntu-1604:201903-01
environment:
DB: no-db
steps:
- e2e
e2e-postgres:
working_directory: /home/circleci/.go_workspace/src/github.com/argoproj/argo
machine:
Expand Down Expand Up @@ -192,6 +200,7 @@ workflows:
jobs:
- test
- ui
- e2e-no-db
- e2e-postgres
- e2e-mysql
- docker-build
27 changes: 26 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ manifests/install.yaml: dist/VERSION $(MANIFESTS)
manifests/namespace-install.yaml: dist/VERSION $(MANIFESTS)
env VERSION=$(VERSION) ./hack/update-manifests.sh

manifests/quick-start-no-db.yaml: dist/VERSION $(MANIFESTS)
env VERSION=$(VERSION) ./hack/update-manifests.sh

manifests/quick-start-mysql.yaml: dist/VERSION $(MANIFESTS)
env VERSION=$(VERSION) ./hack/update-manifests.sh

Expand Down Expand Up @@ -242,6 +245,24 @@ dist/postgres.yaml: test/e2e/manifests/postgres.yaml
# Create Postgres e2e manifests
cat test/e2e/manifests/postgres.yaml | sed 's/:latest/:$(IMAGE_TAG)/' | sed 's/pns/$(E2E_EXECUTOR)/' > dist/postgres.yaml

test/e2e/manifests/no-db/overlays/argo-server-deployment.yaml: test/e2e/manifests/postgres/overlays/argo-server-deployment.yaml
test/e2e/manifests/no-db/overlays/argo-server-deployment.yaml:
cat test/e2e/manifests/postgres/overlays/argo-server-deployment.yaml | ./hack/auto-gen-msg.sh > test/e2e/manifests/no-db/overlays/argo-server-deployment.yaml

test/e2e/manifests/no-db/overlays/workflow-controller-deployment.yaml: test/e2e/manifests/postgres/overlays/workflow-controller-deployment.yaml
test/e2e/manifests/no-db/overlays/workflow-controller-deployment.yaml:
cat test/e2e/manifests/postgres/overlays/workflow-controller-deployment.yaml | ./hack/auto-gen-msg.sh > test/e2e/manifests/no-db/overlays/workflow-controller-deployment.yaml

test/e2e/manifests/no-db.yaml: $(MANIFESTS) $(E2E_MANIFESTS) test/e2e/manifests/no-db/overlays/argo-server-deployment.yaml test/e2e/manifests/no-db/overlays/workflow-controller-deployment.yaml
# Create no DB e2e manifests
kustomize build test/e2e/manifests/no-db | ./hack/auto-gen-msg.sh > test/e2e/manifests/no-db.yaml

dist/no-db.yaml: test/e2e/manifests/no-db.yaml
# Create no DB e2e manifests
# We additionlly disable ALWAY_OFFLOAD_NODE_STATUS
cat test/e2e/manifests/no-db.yaml | sed 's/:latest/:$(IMAGE_TAG)/' | sed 's/pns/$(E2E_EXECUTOR)/' | sed 's/"true"/"false"/' > dist/no-db.yaml


test/e2e/manifests/mysql/overlays/argo-server-deployment.yaml: test/e2e/manifests/postgres/overlays/argo-server-deployment.yaml
test/e2e/manifests/mysql/overlays/argo-server-deployment.yaml:
cat test/e2e/manifests/postgres/overlays/argo-server-deployment.yaml | ./hack/auto-gen-msg.sh > test/e2e/manifests/mysql/overlays/argo-server-deployment.yaml
Expand All @@ -259,13 +280,17 @@ dist/mysql.yaml: test/e2e/manifests/mysql.yaml
cat test/e2e/manifests/mysql.yaml | sed 's/:latest/:$(IMAGE_TAG)/' | sed 's/pns/$(E2E_EXECUTOR)/' > dist/mysql.yaml

.PHONY: install
install: dist/postgres.yaml dist/mysql.yaml
install: dist/postgres.yaml dist/mysql.yaml dist/no-db.yaml
# Install Postgres quick-start
kubectl get ns argo || kubectl create ns argo
ifeq ($(DB),postgres)
kubectl -n argo apply -f dist/postgres.yaml
else
ifeq ($(DB),mysql)
kubectl -n argo apply -f dist/mysql.yaml
else
kubectl -n argo apply -f dist/no-db.yaml
endif
endif

.PHONY: test-images
Expand Down
1 change: 1 addition & 0 deletions hack/update-manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ kustomize build "${SRCROOT}/manifests/namespace-install" | ${SRCROOT}/hack/auto-
sed -i.bak "s@- .*/argoexec:.*@- ${IMAGE_NAMESPACE}/argoexec:${VERSION}@" "${SRCROOT}/manifests/namespace-install.yaml"
rm -f "${SRCROOT}/manifests/namespace-install.yaml.bak"

kustomize build ${SRCROOT}/manifests/quick-start/no-db | sed "s/:latest/:$VERSION/" | ${SRCROOT}/hack/auto-gen-msg.sh > ${SRCROOT}/manifests/quick-start-no-db.yaml
kustomize build ${SRCROOT}/manifests/quick-start/mysql | sed "s/:latest/:$VERSION/" | ${SRCROOT}/hack/auto-gen-msg.sh > ${SRCROOT}/manifests/quick-start-mysql.yaml
kustomize build ${SRCROOT}/manifests/quick-start/postgres | sed "s/:latest/:$VERSION/" | ${SRCROOT}/hack/auto-gen-msg.sh > ${SRCROOT}/manifests/quick-start-postgres.yaml
Loading