From fe06bdc8aa84491fd1a1107671c0257cf6bfb117 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Sat, 5 Jun 2021 13:12:11 -0700 Subject: [PATCH 1/3] ci: Fix `make manifests` Signed-off-by: Alex Collins --- Makefile | 20 +++++++++++++------- manifests/install.yaml | 10 ++++++++++ manifests/quick-start-minimal.yaml | 1 + manifests/quick-start-mysql.yaml | 1 + manifests/quick-start-postgres.yaml | 1 + 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 00e7af86bc26..a44fa300e01c 100644 --- a/Makefile +++ b/Makefile @@ -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/$* > $@ diff --git a/manifests/install.yaml b/manifests/install.yaml index 577352812774..061540e06685 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -197,16 +197,19 @@ apiVersion: v1 kind: ServiceAccount metadata: name: argo + namespace: argo --- apiVersion: v1 kind: ServiceAccount metadata: name: argo-server + namespace: argo --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: argo-role + namespace: argo rules: - apiGroups: - coordination.k8s.io @@ -470,6 +473,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: argo-binding + namespace: argo roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -477,6 +481,7 @@ roleRef: subjects: - kind: ServiceAccount name: argo + namespace: argo --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -508,11 +513,13 @@ apiVersion: v1 kind: ConfigMap metadata: name: workflow-controller-configmap + namespace: argo --- apiVersion: v1 kind: Service metadata: name: argo-server + namespace: argo spec: ports: - name: web @@ -525,6 +532,7 @@ apiVersion: v1 kind: Service metadata: name: workflow-controller-metrics + namespace: argo spec: ports: - name: metrics @@ -538,6 +546,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: argo-server + namespace: argo spec: selector: matchLabels: @@ -582,6 +591,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: workflow-controller + namespace: argo spec: selector: matchLabels: diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml index 62db102ec09d..8aa6b288a09b 100644 --- a/manifests/quick-start-minimal.yaml +++ b/manifests/quick-start-minimal.yaml @@ -667,6 +667,7 @@ data: enabled: true path: /metrics port: 9090 + namespaceParallelism: "10" kind: ConfigMap metadata: name: workflow-controller-configmap diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml index 71c84d408115..1ae29ae1779b 100644 --- a/manifests/quick-start-mysql.yaml +++ b/manifests/quick-start-mysql.yaml @@ -667,6 +667,7 @@ data: enabled: true path: /metrics port: 9090 + namespaceParallelism: "10" persistence: | connectionPool: maxIdleConns: 100 diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml index ea79776b78da..fef3260fae16 100644 --- a/manifests/quick-start-postgres.yaml +++ b/manifests/quick-start-postgres.yaml @@ -667,6 +667,7 @@ data: enabled: true path: /metrics port: 9090 + namespaceParallelism: "10" persistence: | connectionPool: maxIdleConns: 100 From 1b8bacabd80ec56f17d0027c955fd9ccdd959b27 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Sat, 5 Jun 2021 13:14:57 -0700 Subject: [PATCH 2/3] Revert "fix(installation): Enable capacity to override namespace with Kustomize (#5907)" This reverts commit 8fde4e4f46f59a6af50e5cc432f632f6f5e774d9. Signed-off-by: Alex Collins --- .../argo-server-rbac/argo-server-clusterolebinding.yaml | 2 +- manifests/cluster-install/kustomization.yaml | 1 - .../workflow-controller-clusterrolebinding.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml b/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml index 70a2960b8f0f..6d7ac27ff5e0 100644 --- a/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml +++ b/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml @@ -9,4 +9,4 @@ roleRef: subjects: - kind: ServiceAccount name: argo-server - namespace: default + namespace: argo diff --git a/manifests/cluster-install/kustomization.yaml b/manifests/cluster-install/kustomization.yaml index 94e2c768ea8a..a1698bd2ac72 100644 --- a/manifests/cluster-install/kustomization.yaml +++ b/manifests/cluster-install/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: argo resources: - ../base diff --git a/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml b/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml index cce4ae7bc35e..b4e54ea67c90 100644 --- a/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml +++ b/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml @@ -9,4 +9,4 @@ roleRef: subjects: - kind: ServiceAccount name: argo - namespace: default + namespace: argo From 25890b5a2aff32f54140356b1314ff3ebf581fae Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Sat, 5 Jun 2021 13:16:49 -0700 Subject: [PATCH 3/3] ok Signed-off-by: Alex Collins --- Makefile | 2 +- manifests/install.yaml | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile b/Makefile index a44fa300e01c..79bab6aa36b1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/manifests/install.yaml b/manifests/install.yaml index 061540e06685..577352812774 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -197,19 +197,16 @@ apiVersion: v1 kind: ServiceAccount metadata: name: argo - namespace: argo --- apiVersion: v1 kind: ServiceAccount metadata: name: argo-server - namespace: argo --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: argo-role - namespace: argo rules: - apiGroups: - coordination.k8s.io @@ -473,7 +470,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: argo-binding - namespace: argo roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -481,7 +477,6 @@ roleRef: subjects: - kind: ServiceAccount name: argo - namespace: argo --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -513,13 +508,11 @@ apiVersion: v1 kind: ConfigMap metadata: name: workflow-controller-configmap - namespace: argo --- apiVersion: v1 kind: Service metadata: name: argo-server - namespace: argo spec: ports: - name: web @@ -532,7 +525,6 @@ apiVersion: v1 kind: Service metadata: name: workflow-controller-metrics - namespace: argo spec: ports: - name: metrics @@ -546,7 +538,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: argo-server - namespace: argo spec: selector: matchLabels: @@ -591,7 +582,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: workflow-controller - namespace: argo spec: selector: matchLabels: