fix: generate no-db manifests

jamhed · Jan 27, 2020 · ef1c403 · ef1c403
1 parent a37562a
commit ef1c403
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -194,16 +194,12 @@ codegen:
  go run ./hack/gen-openapi-spec/main.go $(VERSION) > ./api/openapi-spec/swagger.json
 
 .PHONY: verify-codegen
-verify-codegen:
+verify-codegen: codegen
  # Verify generated code
- ./hack/verify-codegen.sh
- ./hack/update-openapigen.sh --verify-only
- mkdir -p ./dist
- go run ./hack/gen-openapi-spec/main.go $(VERSION) > ./dist/swagger.json
- diff ./dist/swagger.json ./api/openapi-spec/swagger.json
+ git diff --exit-code
 
 .PHONY: manifests
-manifests: manifests/install.yaml manifests/namespace-install.yaml manifests/quick-start-mysql.yaml manifests/quick-start-postgres.yaml test/e2e/manifests/postgres.yaml test/e2e/manifests/mysql.yaml
+manifests: manifests/install.yaml manifests/namespace-install.yaml manifests/quick-start-mysql.yaml manifests/quick-start-postgres.yaml manifests/quick-start-no-db.yaml test/e2e/manifests/postgres.yaml test/e2e/manifests/mysql.yaml test/e2e/manifests/no-db.yaml
 
 # we use a different file to ./VERSION to force updating manifests after a `make clean`
 dist/MANIFESTS_VERSION:

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -2,7 +2,7 @@
  "swagger": "2.0",
  "info": {
  "title": "Argo",
- "version": "v2.5.0-rc2"
+ "version": "release-2.5"
  },
  "paths": {},
  "definitions": {

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -379,7 +379,7 @@ spec:
  - --configmap
  - workflow-controller-configmap
  - --executor-image
- - argoproj/argoexec:v2.5.0-rc2
+ - argoproj/argoexec:release-2.5
  command:
  - workflow-controller
  image: argoproj/workflow-controller:v2.5.0-rc2

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -287,7 +287,7 @@ spec:
  - --configmap
  - workflow-controller-configmap
  - --executor-image
- - argoproj/argoexec:v2.5.0-rc2
+ - argoproj/argoexec:release-2.5
  - --namespaced
  command:
  - workflow-controller

diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
@@ -444,7 +444,7 @@ spec:
  - --configmap
  - workflow-controller-configmap
  - --executor-image
- - argoproj/argoexec:v2.5.0-rc2
+ - argoproj/argoexec:release-2.5
  - --namespaced
  command:
  - workflow-controller

diff --git a/manifests/quick-start-no-db.yaml b/manifests/quick-start-no-db.yaml
@@ -359,7 +359,7 @@ spec:
  - --configmap
  - workflow-controller-configmap
  - --executor-image
- - argoproj/argoexec:v2.5.0-rc2
+ - argoproj/argoexec:release-2.5
  - --namespaced
  command:
  - workflow-controller

diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
@@ -436,7 +436,7 @@ spec:
  - --configmap
  - workflow-controller-configmap
  - --executor-image
- - argoproj/argoexec:v2.5.0-rc2
+ - argoproj/argoexec:release-2.5
  - --namespaced
  command:
  - workflow-controller