updated docker file, fix deprecation

equinor · Sep 25, 2023 · 8d279a8 · 8d279a8
1 parent 682f066
commit 8d279a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine3.18 as builder
+FROM golang:1.21-alpine3.18 as builder
 ENV GO111MODULE=on
 
 RUN apk update && \
@@ -42,4 +42,4 @@ COPY --from=builder /usr/local/bin/radix-api /usr/local/bin/radix-api
 
 EXPOSE 3001
 USER 1000
-ENTRYPOINT ["/usr/local/bin/radix-api"]
+ENTRYPOINT ["/usr/local/bin/radix-api"]
diff --git a/api/alerting/handler.go b/api/alerting/handler.go
@@ -222,7 +222,7 @@ func (h *handler) validateUpdateSlackConfig(slackConfig *alertModels.UpdateSlack
 func (h *handler) waitForRadixAlertReconciled(ctx context.Context, source *radixv1.RadixAlert) (*radixv1.RadixAlert, bool) {
 	var reconciledAlert *radixv1.RadixAlert
 
-	hasReconciled := func() (bool, error) {
+	hasReconciled := func(ctx context.Context) (bool, error) {
 		radixAlert, err := h.accounts.UserAccount.RadixClient.RadixV1().RadixAlerts(source.Namespace).Get(ctx, source.Name, metav1.GetOptions{})
 		if err != nil {
 			return false, err
@@ -233,9 +233,10 @@ func (h *handler) waitForRadixAlertReconciled(ctx context.Context, source *radix
 		return radixAlert.Status.Reconciled != nil, nil
 	}
 
-	if err := wait.PollImmediate(h.reconcilePollInterval, h.reconcilePollTimeout, hasReconciled); err != nil {
+	if err := wait.PollUntilContextTimeout(ctx, h.reconcilePollInterval, h.reconcilePollTimeout, true, hasReconciled); err != nil {
 		return nil, false
 	}
+
 	return reconciledAlert, true
 }