diff --git a/group_vars/stage_dev/argocd.yml b/group_vars/stage_dev/argocd.yml new file mode 100644 index 0000000..a9e4aeb --- /dev/null +++ b/group_vars/stage_dev/argocd.yml @@ -0,0 +1,7 @@ +--- + +awx_operator_revision: "main" +awx_smardigo_revision: "main" + +jaeger_operator_revision: "main" +jaeger_smardigo_revision: "main" diff --git a/roles/kubernetes/argocd/defaults/main.yml b/roles/kubernetes/argocd/defaults/main.yml index f952148..41975e6 100644 --- a/roles/kubernetes/argocd/defaults/main.yml +++ b/roles/kubernetes/argocd/defaults/main.yml @@ -172,9 +172,9 @@ k8s_argocd_helm__release_values: server: https://kubernetes.default.svc project: infrastructure source: - path: apps/{{ stage }}/awx-operator - repoURL: https://{{ shared_service_gitea_hostname }}/gitea-admin/argocd.git - targetRevision: main + path: config/default + repoURL: https://{{ shared_service_gitea_hostname }}/argocd/awx-operator.git + targetRevision: '{{ awx_operator_revision | default(stage) }}' syncPolicy: automated: prune: true @@ -190,8 +190,8 @@ k8s_argocd_helm__release_values: project: infrastructure source: path: apps/{{ stage }}/awx - repoURL: https://{{ shared_service_gitea_hostname }}/gitea-admin/argocd.git - targetRevision: main + repoURL: https://{{ shared_service_gitea_hostname }}/argocd/argocd.git + targetRevision: '{{ awx_smardigo_revision | default(stage) }}' syncPolicy: automated: prune: true @@ -207,8 +207,8 @@ k8s_argocd_helm__release_values: project: infrastructure source: path: config/default - repoURL: https://{{ shared_service_gitea_hostname }}/gitea-admin/jaeger-operator.git - targetRevision: v1.31.0 + repoURL: https://{{ shared_service_gitea_hostname }}/argocd/jaeger-operator.git + targetRevision: '{{ jaeger_operator_revision | default(stage) }}' syncPolicy: automated: prune: true @@ -224,8 +224,8 @@ k8s_argocd_helm__release_values: project: infrastructure source: path: apps/{{ stage }}/jaeger - repoURL: https://{{ shared_service_gitea_hostname }}/gitea-admin/argocd.git - targetRevision: HEAD + repoURL: https://{{ shared_service_gitea_hostname }}/argocd/argocd.git + targetRevision: '{{ jaeger_smardigo_revision | default(stage) }}' syncPolicy: automated: prune: true