diff --git a/argocd/applications/archive-production/metallb-application.yaml b/argocd/applications/archive-production/metallb-application.yaml index d996cc7..89d34b8 100644 --- a/argocd/applications/archive-production/metallb-application.yaml +++ b/argocd/applications/archive-production/metallb-application.yaml @@ -1,21 +1,30 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: production-metallb-application namespace: argocd spec: project: default # Todo define a project to limit the deployment types source: chart: metallb repoURL: https://metallb.github.io/metallb targetRevision: 0.13.5 helm: releaseName: metallb destination: server: https://rancher.euwest.azure.internal.softwareheritage.org/k8s/clusters/c-2mwgb namespace: metallb syncPolicy: automated: prune: true selfHeal: true allowEmpty: false + syncOptions: + - RespectIgnoreDifferences=true + + ignoreDifferences: + # The ca bundle is updated by the controller during the runtime + - group: 'apiextensions.k8s.io' + kind: 'CustomResourceDefinition' + jsonPointers: + - /spec/conversion/webhook/clientConfig/caBundle diff --git a/argocd/applications/metallb-application.yaml b/argocd/applications/metallb-application.yaml index 735b8b1..1e8e1f4 100644 --- a/argocd/applications/metallb-application.yaml +++ b/argocd/applications/metallb-application.yaml @@ -1,23 +1,32 @@ # Declare the argocd application application applying the argocd directory # content to the argocd cluster apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: argocd-metallb-application namespace: argocd spec: project: default # Todo define a project to limit the deployment types source: chart: metallb repoURL: https://metallb.github.io/metallb targetRevision: 0.13.5 helm: releaseName: metallb destination: server: https://kubernetes.default.svc namespace: metallb syncPolicy: automated: prune: true selfHeal: true allowEmpty: false + syncOptions: + - RespectIgnoreDifferences=true + + ignoreDifferences: + # The ca bundle is updated by the controller during the runtime + - group: 'apiextensions.k8s.io' + kind: 'CustomResourceDefinition' + jsonPointers: + - /spec/conversion/webhook/clientConfig/caBundle diff --git a/argocd/argocd-install.yaml b/argocd/argocd-install.yaml index 3e69d14..fc705a3 100644 --- a/argocd/argocd-install.yaml +++ b/argocd/argocd-install.yaml @@ -1,37 +1,35 @@ # Declare the application to deploy the swh services apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: argocd-argocd-install namespace: argocd spec: project: default source: repoURL: 'https://github.com/argoproj/argo-cd.git' path: manifests targetRevision: v2.4.12 directory: recurse: false include: install.yaml destination: server: https://kubernetes.default.svc namespace: argocd syncPolicy: automated: prune: true selfHeal: true - - syncPolicy: syncOptions: - RespectIgnoreDifferences=true ignoreDifferences: # The argocd-ssh-known-hosts-cm ConfigMap is redeclared in our descritor to add the forge keys - kind: ConfigMap name: argocd-ssh-known-hosts-cm jsonPointers: - /data - /metadata/labels revisionHistoryLimit: 2