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

Jump to bottom

build: Fix make codegen #6090

Merged
merged 5 commits into from
Jun 7, 2021
Merged

build: Fix make codegen #6090

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe06bdc
ci: Fix `make manifests`
alexec Jun 5, 2021
1b8baca
Revert "fix(installation): Enable capacity to override namespace with…
alexec Jun 5, 2021
25890b5
ok
alexec Jun 5, 2021
623c66d
Merge branch 'master' into manifests
alexec Jun 7, 2021
72be238
Merge branch 'master' into manifests
alexec Jun 7, 2021
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
22 changes: 14 additions & 8 deletions Makefile
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: argo
namespace: default
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @alexec!
Modifying this line break compatibility with dynamic change namespace insert by me here #5907

namespace: argo
1 change: 1 addition & 0 deletions manifests/quick-start-minimal.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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