Skip to content

Commit

Permalink
build: Fix make codegen (#6090)
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Collins <[email protected]>
  • Loading branch information
alexec committed Jun 8, 2021
1 parent 5d4947c commit 6003d51
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 11 deletions.
22 changes: 14 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ scan-%:
# generation

.PHONY: codegen
codegen: types swagger docs
codegen: types swagger docs manifests

.PHONY: types
types: pkg/apis/workflow/v1alpha1/generated.proto pkg/apis/workflow/v1alpha1/openapi_generated.go pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go
Expand Down Expand Up @@ -355,24 +355,30 @@ dist/kustomize:
cd dist && ./install_kustomize.sh 3.8.8
dist/kustomize version

manifests: dist/manifests/install.yaml \
manifests: \
manifests/install.yaml \
manifests/namespace-install.yaml \
manifests/quick-start-minimal.yaml \
manifests/quick-start-mysql.yaml \
manifests/quick-start-postgres.yaml \
dist/manifests/install.yaml \
dist/manifests/namespace-install.yaml \
dist/manifests/quick-start-minimal.yaml \
dist/manifests/quick-start-mysql.yaml \
dist/manifests/quick-start-postgres.yaml

manifests/install.yaml: /dev/null
manifests/install.yaml: dist/kustomize /dev/null
dist/kustomize build --load_restrictor=none manifests/cluster-install | ./hack/auto-gen-msg.sh > manifests/install.yaml
manifests/namespace-install.yaml: /dev/null
manifests/namespace-install.yaml: dist/kustomize /dev/null
dist/kustomize build --load_restrictor=none manifests/namespace-install | ./hack/auto-gen-msg.sh > manifests/namespace-install.yaml
manifests/quick-start-minimal.yaml: /dev/null
manifests/quick-start-minimal.yaml: dist/kustomize /dev/null
dist/kustomize build --load_restrictor=none manifests/quick-start/minimal | ./hack/auto-gen-msg.sh > manifests/quick-start-minimal.yaml
manifests/quick-start-mysql.yaml: /dev/null
manifests/quick-start-mysql.yaml: dist/kustomize /dev/null
dist/kustomize build --load_restrictor=none manifests/quick-start/mysql | ./hack/auto-gen-msg.sh > manifests/quick-start-mysql.yaml
manifests/quick-start-postgres.yaml: /dev/null
manifests/quick-start-postgres.yaml: dist/kustomize /dev/null
dist/kustomize build --load_restrictor=none manifests/quick-start/postgres | ./hack/auto-gen-msg.sh > manifests/quick-start-postgres.yaml

dist/manifests/%: manifests/$*
dist/manifests/%: manifests/%
@mkdir -p dist/manifests
sed 's/:latest/:$(VERSION)/' manifests/$* > $@

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: argo-server
namespace: default
namespace: argo
1 change: 0 additions & 1 deletion manifests/cluster-install/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: argo

resources:
- ../base
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: argo
namespace: default
namespace: argo
1 change: 1 addition & 0 deletions manifests/quick-start-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ data:
enabled: true
path: /metrics
port: 9090
namespaceParallelism: "10"
kind: ConfigMap
metadata:
name: workflow-controller-configmap
Expand Down
1 change: 1 addition & 0 deletions manifests/quick-start-mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ data:
enabled: true
path: /metrics
port: 9090
namespaceParallelism: "10"
persistence: |
connectionPool:
maxIdleConns: 100
Expand Down
1 change: 1 addition & 0 deletions manifests/quick-start-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ data:
enabled: true
path: /metrics
port: 9090
namespaceParallelism: "10"
persistence: |
connectionPool:
maxIdleConns: 100
Expand Down

0 comments on commit 6003d51

Please sign in to comment.