diff --git a/integration/benchnet2/flow/templates/access.yml b/integration/benchnet2/flow/templates/access.yml index 00208c935e8..d9a68f235b4 100644 --- a/integration/benchnet2/flow/templates/access.yml +++ b/integration/benchnet2/flow/templates/access.yml @@ -7,8 +7,8 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} - nodeType: access + network: {{ $.Values.networkId }} + role: access owner: {{ $.Values.owner }} service: flow @@ -18,9 +18,9 @@ spec: selector: matchLabels: app: {{ $k }} - nodeType: access + role: access service: flow - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} template: metadata: @@ -30,9 +30,9 @@ spec: prometheus.io/port: "8080" labels: app: {{ $k }} - nodeType: access + role: access service: flow - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: nodeSelector: iam.gke.io/gke-metadata-server-enabled: "true" @@ -84,7 +84,7 @@ spec: - metadata: name: data labels: - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: accessModes: ["ReadWriteOnce"] resources: @@ -105,7 +105,7 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: {{ if $v.servicePorts }} ports: {{ $v.servicePorts | toYaml | nindent 12 }} diff --git a/integration/benchnet2/flow/templates/collection.yml b/integration/benchnet2/flow/templates/collection.yml index a12805e6103..e73d00f7b18 100644 --- a/integration/benchnet2/flow/templates/collection.yml +++ b/integration/benchnet2/flow/templates/collection.yml @@ -7,8 +7,8 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} - nodeType: collection + network: {{ $.Values.networkId }} + role: collection owner: {{ $.Values.owner }} service: flow @@ -18,7 +18,7 @@ spec: selector: matchLabels: app: {{ $k }} - nodeType: collection + role: collection service: flow template: @@ -29,9 +29,9 @@ spec: prometheus.io/port: "8080" labels: app: {{ $k }} - nodeType: collection + role: collection service: flow - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: nodeSelector: iam.gke.io/gke-metadata-server-enabled: "true" @@ -83,7 +83,7 @@ spec: - metadata: name: data labels: - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: accessModes: ["ReadWriteOnce"] resources: @@ -103,7 +103,7 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} owner: {{ $.Values.owner }} spec: {{ if $v.servicePorts }} @@ -114,4 +114,4 @@ spec: selector: app: {{ $k }} type: NodePort -{{- end }} \ No newline at end of file +{{- end }} diff --git a/integration/benchnet2/flow/templates/consensus.yml b/integration/benchnet2/flow/templates/consensus.yml index bbe42e00370..ddfbf84380a 100644 --- a/integration/benchnet2/flow/templates/consensus.yml +++ b/integration/benchnet2/flow/templates/consensus.yml @@ -7,8 +7,8 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} - nodeType: consensus + network: {{ $.Values.networkId }} + role: consensus owner: {{ $.Values.owner }} service: flow @@ -18,7 +18,7 @@ spec: selector: matchLabels: app: {{ $k }} - nodeType: consensus + role: consensus service: flow template: @@ -29,9 +29,9 @@ spec: prometheus.io/port: "8080" labels: app: {{ $k }} - nodeType: consensus + role: consensus service: flow - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: nodeSelector: iam.gke.io/gke-metadata-server-enabled: "true" @@ -83,7 +83,7 @@ spec: - metadata: name: data labels: - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: accessModes: ["ReadWriteOnce"] resources: @@ -103,7 +103,7 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} owner: {{ $.Values.owner }} spec: {{ if $v.servicePorts }} @@ -114,4 +114,4 @@ spec: selector: app: {{ $k }} type: NodePort -{{- end }} \ No newline at end of file +{{- end }} diff --git a/integration/benchnet2/flow/templates/execution.yml b/integration/benchnet2/flow/templates/execution.yml index f620edd1b21..67e6daad85d 100644 --- a/integration/benchnet2/flow/templates/execution.yml +++ b/integration/benchnet2/flow/templates/execution.yml @@ -7,8 +7,8 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} - nodeType: execution + network: {{ $.Values.networkId }} + role: execution owner: {{ $.Values.owner }} service: flow @@ -18,7 +18,7 @@ spec: selector: matchLabels: app: {{ $k }} - nodeType: execution + role: execution service: flow template: @@ -29,9 +29,9 @@ spec: prometheus.io/port: "8080" labels: app: {{ $k }} - nodeType: execution + role: execution service: flow - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: nodeSelector: iam.gke.io/gke-metadata-server-enabled: "true" @@ -83,7 +83,7 @@ spec: - metadata: name: data labels: - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: accessModes: ["ReadWriteOnce"] resources: @@ -103,7 +103,7 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} owner: {{ $.Values.owner }} spec: {{ if $v.servicePorts }} diff --git a/integration/benchnet2/flow/templates/verification.yml b/integration/benchnet2/flow/templates/verification.yml index b189182d40d..02d7870e131 100644 --- a/integration/benchnet2/flow/templates/verification.yml +++ b/integration/benchnet2/flow/templates/verification.yml @@ -7,9 +7,9 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - nodeType: verification + network: {{ $.Values.networkId }} + role: verification service: flow - networkId: {{ $.Values.networkId }} spec: serviceName: {{ $k }} @@ -17,9 +17,9 @@ spec: selector: matchLabels: app: {{ $k }} - nodeType: verification + role: verification service: flow - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} template: metadata: @@ -29,8 +29,8 @@ spec: prometheus.io/port: "8080" labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} - nodeType: verification + network: {{ $.Values.networkId }} + role: verification owner: {{ $.Values.owner }} service: flow spec: @@ -83,7 +83,7 @@ spec: - metadata: name: data labels: - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} spec: accessModes: ["ReadWriteOnce"] resources: @@ -103,7 +103,7 @@ metadata: name: {{ $k }} labels: app: {{ $k }} - networkId: {{ $.Values.networkId }} + network: {{ $.Values.networkId }} owner: {{ $.Values.owner }} spec: {{ if $v.servicePorts }} @@ -114,4 +114,4 @@ spec: selector: app: {{ $k }} type: NodePort -{{- end }} \ No newline at end of file +{{- end }}