Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ params:
source: "event.id"
type: "string"
required: true
- name: "runId"
source: "env.RUN_ID"
type: "string"
required: false

# Preconditions with valid operators and CEL expressions
preconditions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ metadata:
labels:
hyperfleet.io/cluster-id: "{{ .clusterId }}"
hyperfleet.io/resource-type: "deployment"
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
annotations:
hyperfleet.io/generation: "{{ .generationSpec }}"
spec:
Expand All @@ -15,11 +18,17 @@ spec:
matchLabels:
app: test
hyperfleet.io/cluster-id: "{{ .clusterId }}"
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
template:
metadata:
labels:
app: test
hyperfleet.io/cluster-id: "{{ .clusterId }}"
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
spec:
containers:
- name: test
Expand Down
4 changes: 4 additions & 0 deletions helmfile/configs/e2e/adapters/cl-job/adapter-task-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ params:
source: "event.id"
type: "string"
required: true
- name: "runId"
source: "env.RUN_ID"
type: "string"
required: false

# Preconditions with valid operators and CEL expressions
preconditions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ metadata:
labels:
hyperfleet.io/cluster-id: "{{ .clusterId }}"
hyperfleet.io/resource-type: "job"
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
app: test-job
annotations:
hyperfleet.io/generation: "{{ .generationSpec }}"
spec:
backoffLimit: 0
template:
metadata:
labels:
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
spec:
restartPolicy: Never
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ params:
source: "env.NAMESPACE"
type: "string"

- name: "runId"
source: "env.RUN_ID"
type: "string"
required: false

# Preconditions with valid operators and CEL expressions
preconditions:
- name: "clusterStatus"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ metadata:
{{ if .platformType }}
hyperfleet.io/platform-type: "{{ .platformType }}"
{{ end }}
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}

# Annotations for metadata and operational information
annotations:
Expand Down Expand Up @@ -65,6 +68,9 @@ spec:
app.kubernetes.io/instance: "{{ .adapter.name }}"
app.kubernetes.io/name: cl-maestro
app.kubernetes.io/transport: maestro
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
annotations:
hyperfleet.io/generation: "{{ .generation }}"
- apiVersion: v1
Expand All @@ -91,6 +97,9 @@ spec:
app.kubernetes.io/name: cl-maestro
app.kubernetes.io/version: 1.0.0
app.kubernetes.io/transport: maestro
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
annotations:
hyperfleet.io/generation: "{{ .generation }}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ params:
type: "string"
required: false
default: "false"
- name: "runId"
source: "env.RUN_ID"
type: "string"
required: false

# Preconditions with valid operators and CEL expressions
preconditions:
Expand Down Expand Up @@ -67,6 +71,7 @@ resources:
e2e.hyperfleet.io/test-run-id: "{{ .testRunId }}"
e2e.hyperfleet.io/ci: "{{ .ci }}"
e2e.hyperfleet.io/managed-by: "test-framework"
e2e.hyperfleet.io/run-id: "{{ .runId }}"
annotations:
hyperfleet.io/generation: "{{ .generationSpec }}"
discovery:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ params:
source: "event.id"
type: "string"
required: true
- name: "runId"
source: "env.RUN_ID"
type: "string"
required: false

# Preconditions with valid operators and CEL expressions
preconditions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ metadata:
hyperfleet.io/nodepool-id: "{{ .nodepoolId }}"
hyperfleet.io/nodepool-name: "{{ .nodepoolName }}"
hyperfleet.io/resource-type: "configmap"
{{ if .runId }}
e2e.hyperfleet.io/run-id: "{{ .runId }}"
{{ end }}
annotations:
hyperfleet.io/generation: "{{ .generationSpec }}"
data:
Expand Down
2 changes: 1 addition & 1 deletion helmfile/helmfile.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ releases:
# HyperFleet API
- name: hyperfleet-api
namespace: {{ .Values.namespace }}
chart: hyperfleet-api/hyperfleet-api
chart: hyperfleet-api/hyperfleet-api
labels:
component: api
values:
Expand Down
3 changes: 3 additions & 0 deletions helmfile/values/base-adapter.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ image:
tag: {{ env "ADAPTER_IMAGE_TAG" | default "dev" }}
pullPolicy: {{ env "IMAGE_PULL_POLICY" | default "IfNotPresent" }}


adapterConfig:
log:
level: debug
Expand All @@ -30,3 +31,5 @@ env:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: RUN_ID
value: {{ env "RUN_ID" | default "unknown" }}