From 4b25473c646aaf27a45bd31de062970ce5762595 Mon Sep 17 00:00:00 2001 From: Sarfaraz Ahamad Date: Tue, 4 Feb 2025 19:35:31 +0530 Subject: [PATCH] Adding execTimeout code to this branch Signed-off-by: Sarfaraz Ahamad --- api/v1alpha1/argocd_types.go | 3 --- bundle/manifests/argocd-operator.clusterserviceversion.yaml | 2 +- controllers/argocd/deployment_test.go | 1 + .../0.14.0/argocd-operator.v0.14.0.clusterserviceversion.yaml | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api/v1alpha1/argocd_types.go b/api/v1alpha1/argocd_types.go index 42c73ea6d..78c5d3bba 100644 --- a/api/v1alpha1/argocd_types.go +++ b/api/v1alpha1/argocd_types.go @@ -39,9 +39,6 @@ func init() { // +kubebuilder:deprecatedversion:warning="ArgoCD v1alpha1 version is deprecated and will be converted to v1beta1 automatically. Moving forward, please use v1beta1 as the ArgoCD API version." //+kubebuilder:object:root=true -// +kubebuilder:validation:Pattern:="^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$" -type Duration string - // ArgoCD is the Schema for the argocds API // +k8s:openapi-gen=true // +kubebuilder:subresource:status diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml index 1fae75048..58a2d3b0d 100644 --- a/bundle/manifests/argocd-operator.clusterserviceversion.yaml +++ b/bundle/manifests/argocd-operator.clusterserviceversion.yaml @@ -247,7 +247,7 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" - createdAt: "2025-02-04T08:55:16Z" + createdAt: "2025-02-04T14:05:14Z" description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. operators.operatorframework.io/builder: operator-sdk-v1.35.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 diff --git a/controllers/argocd/deployment_test.go b/controllers/argocd/deployment_test.go index d0c306d18..63ac76eb1 100644 --- a/controllers/argocd/deployment_test.go +++ b/controllers/argocd/deployment_test.go @@ -421,6 +421,7 @@ func TestReconcileArgoCD_reconcileRepoDeployment_env(t *testing.T) { assert.Len(t, deployment.Spec.Template.Spec.Containers[0].Env, 2) assert.Contains(t, deployment.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{Name: "ARGOCD_EXEC_TIMEOUT", Value: "600s"}) }) + t.Run("ExecTimeout not set", func(t *testing.T) { logf.SetLogger(ZapLogger(true)) a := makeTestArgoCD() diff --git a/deploy/olm-catalog/argocd-operator/0.14.0/argocd-operator.v0.14.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.14.0/argocd-operator.v0.14.0.clusterserviceversion.yaml index 1fae75048..58a2d3b0d 100644 --- a/deploy/olm-catalog/argocd-operator/0.14.0/argocd-operator.v0.14.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.14.0/argocd-operator.v0.14.0.clusterserviceversion.yaml @@ -247,7 +247,7 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" - createdAt: "2025-02-04T08:55:16Z" + createdAt: "2025-02-04T14:05:14Z" description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. operators.operatorframework.io/builder: operator-sdk-v1.35.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4