Skip to content

Commit ed8a56f

Browse files
committed
Added some more debugging.
1 parent f4af304 commit ed8a56f

File tree

6 files changed

+39
-3
lines changed

6 files changed

+39
-3
lines changed

charts/eoapi/templates/services/multidim/deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
labels:
6+
{{- include "eoapi.labels" . | nindent 4 }}
7+
app.kubernetes.io/component: multidim
68
app: {{ .Release.Name }}-multidim
79
gitsha: {{ .Values.gitSha }}
810
name: {{ .Release.Name }}-multidim
@@ -22,10 +24,14 @@ spec:
2224
maxUnavailable: 0
2325
selector:
2426
matchLabels:
27+
{{- include "eoapi.selectorLabels" . | nindent 6 }}
28+
app.kubernetes.io/component: multidim
2529
app: {{ .Release.Name }}-multidim
2630
template:
2731
metadata:
2832
labels:
33+
{{- include "eoapi.selectorLabels" . | nindent 8 }}
34+
app.kubernetes.io/component: multidim
2935
app: {{ .Release.Name }}-multidim
3036
{{- with .Values.multidim.settings.labels }}
3137
{{- toYaml . | nindent 8 }}

charts/eoapi/templates/services/raster/deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
labels:
6+
{{- include "eoapi.labels" . | nindent 4 }}
7+
app.kubernetes.io/component: raster
68
app: {{ .Release.Name }}-raster
79
gitsha: {{ .Values.gitSha }}
810
name: {{ .Release.Name }}-raster
@@ -22,10 +24,14 @@ spec:
2224
maxUnavailable: 0
2325
selector:
2426
matchLabels:
27+
{{- include "eoapi.selectorLabels" . | nindent 6 }}
28+
app.kubernetes.io/component: raster
2529
app: {{ .Release.Name }}-raster
2630
template:
2731
metadata:
2832
labels:
33+
{{- include "eoapi.selectorLabels" . | nindent 8 }}
34+
app.kubernetes.io/component: raster
2935
app: {{ .Release.Name }}-raster
3036
{{- with .Values.raster.settings.labels }}
3137
{{- toYaml . | nindent 8 }}

charts/eoapi/templates/services/stac/deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
labels:
6+
{{- include "eoapi.labels" . | nindent 4 }}
7+
app.kubernetes.io/component: stac
68
app: {{ .Release.Name }}-stac
79
gitsha: {{ .Values.gitSha }}
810
name: {{ .Release.Name }}-stac
@@ -22,10 +24,14 @@ spec:
2224
maxUnavailable: 0
2325
selector:
2426
matchLabels:
27+
{{- include "eoapi.selectorLabels" . | nindent 6 }}
28+
app.kubernetes.io/component: stac
2529
app: {{ .Release.Name }}-stac
2630
template:
2731
metadata:
2832
labels:
33+
{{- include "eoapi.selectorLabels" . | nindent 8 }}
34+
app.kubernetes.io/component: stac
2935
app: {{ .Release.Name }}-stac
3036
{{- with .Values.stac.settings.labels }}
3137
{{- toYaml . | nindent 8 }}

charts/eoapi/templates/services/vector/deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
labels:
6+
{{- include "eoapi.labels" . | nindent 4 }}
7+
app.kubernetes.io/component: vector
68
app: {{ .Release.Name }}-vector
79
gitsha: {{ .Values.gitSha }}
810
name: {{ .Release.Name }}-vector
@@ -22,10 +24,14 @@ spec:
2224
maxUnavailable: 0
2325
selector:
2426
matchLabels:
27+
{{- include "eoapi.selectorLabels" . | nindent 6 }}
28+
app.kubernetes.io/component: vector
2529
app: {{ .Release.Name }}-vector
2630
template:
2731
metadata:
2832
labels:
33+
{{- include "eoapi.selectorLabels" . | nindent 8 }}
34+
app.kubernetes.io/component: vector
2935
app: {{ .Release.Name }}-vector
3036
{{- with .Values.vector.settings.labels }}
3137
{{- toYaml . | nindent 8 }}

charts/eoapi/templates/sink-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ metadata:
1616
app.kubernetes.io/component: sink-binding
1717
annotations:
1818
helm.sh/hook: "post-install,post-upgrade"
19-
helm.sh/hook-weight: "15"
19+
helm.sh/hook-weight: "30"
2020
helm.sh/hook-delete-policy: "before-hook-creation"
2121
spec:
2222
subject:

scripts/test.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,21 @@ run_integration_tests() {
175175
-v --tb=short || log_warn "Notification tests failed"
176176
fi
177177

178-
# Wait for pods to be ready
178+
# Wait for pods to be ready - try standard labels first, fallback to legacy
179179
if kubectl get pods -n "$NAMESPACE" >/dev/null 2>&1; then
180-
wait_for_pods "$NAMESPACE" "app.kubernetes.io/name=stac" "300s" || log_warn "STAC pods not ready"
180+
if ! wait_for_pods "$NAMESPACE" "app.kubernetes.io/name=eoapi,app.kubernetes.io/component=stac" "300s" 2>/dev/null; then
181+
wait_for_pods "$NAMESPACE" "app=${RELEASE_NAME}-stac" "300s" || log_warn "STAC pods not ready"
182+
fi
183+
fi
184+
185+
# Wait for Knative services to be ready if they exist
186+
if kubectl get ksvc -n "$NAMESPACE" >/dev/null 2>&1; then
187+
if kubectl get ksvc eoapi-cloudevents-sink -n "$NAMESPACE" >/dev/null 2>&1; then
188+
log_info "Waiting for Knative cloudevents sink to be ready..."
189+
if ! kubectl wait --for=condition=Ready ksvc/eoapi-cloudevents-sink -n "$NAMESPACE" --timeout=120s 2>/dev/null; then
190+
log_warn "Knative cloudevents sink not ready - this may cause SinkBinding warnings"
191+
fi
192+
fi
181193
fi
182194

183195
log_info "✅ Integration tests completed"

0 commit comments

Comments
 (0)