Skip to content

Commit

Permalink
chore: Move quickstart Prometheus port to 9090 (#2487)
Browse files Browse the repository at this point in the history
  • Loading branch information
simster7 committed Mar 20, 2020
1 parent 487ed42 commit bfaf1c2
Show file tree
Hide file tree
Showing 14 changed files with 119 additions and 11 deletions.
4 changes: 2 additions & 2 deletions hack/port-forward.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ info() {
info "MinIO on http:https://localhost:9000"
kubectl -n argo port-forward pod/minio 9000:9000 &

info "Metrics server on http:https://localhost:8080"
kubectl -n argo port-forward deploy/workflow-controller 8080:8080 &
info "Metrics server on http:https://localhost:9090"
kubectl -n argo port-forward deploy/workflow-controller 9090:9090 &

argo_server=$(kubectl -n argo get pod -l app=argo-server -o name)
if [[ "$argo_server" != "" ]]; then
Expand Down
1 change: 1 addition & 0 deletions manifests/base/workflow-controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ resources:
- workflow-controller-configmap.yaml
- workflow-controller-deployment.yaml
- workflow-controller-sa.yaml
- workflow-controller-metrics-service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
selector:
app: workflow-controller
ports:
- port: 9090
targetPort: 9090
protocol: TCP
12 changes: 12 additions & 0 deletions manifests/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,18 @@ spec:
selector:
app: argo-server
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
12 changes: 12 additions & 0 deletions manifests/namespace-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,18 @@ spec:
selector:
app: argo-server
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
14 changes: 13 additions & 1 deletion manifests/quick-start-mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down Expand Up @@ -384,6 +384,18 @@ spec:
selector:
app: mysql
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
14 changes: 13 additions & 1 deletion manifests/quick-start-no-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down Expand Up @@ -342,6 +342,18 @@ spec:
selector:
app: minio
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
14 changes: 13 additions & 1 deletion manifests/quick-start-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down Expand Up @@ -384,6 +384,18 @@ spec:
selector:
app: postgres
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down
14 changes: 13 additions & 1 deletion test/e2e/manifests/mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down Expand Up @@ -384,6 +384,18 @@ spec:
selector:
app: mysql
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
14 changes: 13 additions & 1 deletion test/e2e/manifests/no-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down Expand Up @@ -342,6 +342,18 @@ spec:
selector:
app: minio
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
14 changes: 13 additions & 1 deletion test/e2e/manifests/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ data:
metricsConfig:
enabled: true
path: /metrics
port: 8080
port: 9090
links:
- name: Example Workflow Link
scope: workflow
Expand Down Expand Up @@ -384,6 +384,18 @@ spec:
selector:
app: postgres
---
apiVersion: v1
kind: Service
metadata:
name: workflow-controller-metrics
spec:
ports:
- port: 9090
protocol: TCP
targetPort: 9090
selector:
app: workflow-controller
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down

0 comments on commit bfaf1c2

Please sign in to comment.