Skip to content

Commit 5e05d79

Browse files
committed
fix(terraform): update Argocd application destination name from 'ops' to 'common' and modify Redis host configuration in values.yaml
1 parent ceb47de commit 5e05d79

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

application.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ resource "argocd_application" "argocd" {
1818
}
1919

2020
destination {
21-
name = "ops"
21+
name = "common"
2222
namespace = "argo"
2323
}
2424
}

argocd/prod/values.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ redis:
66
# -- Enable redis
77
enabled: false
88
externalRedis:
9-
host: 10.1.40.3
9+
host: r-7goqq5xexvafy15m2q.redis.rds.aliyuncs.com
1010
# existingSecret: argocd-redis
1111
controller:
1212
replicas: 3
@@ -102,7 +102,7 @@ repoServer:
102102
- list
103103
- watch
104104
apiGroups:
105-
- ''
105+
- ""
106106
resources:
107107
- secrets
108108
- configmaps
@@ -133,11 +133,11 @@ repoServer:
133133
# argocd-vault-plugin with plain YAML
134134
- name: avp-kustomize
135135
command:
136-
- /var/run/argocd/argocd-cmp-server
137-
- --loglevel
138-
- debug
139-
- --logformat
140-
- json
136+
- /var/run/argocd/argocd-cmp-server
137+
- --loglevel
138+
- debug
139+
- --logformat
140+
- json
141141
image: quay.io/argoproj/argocd:v2.13.3
142142
resources:
143143
requests:
@@ -217,12 +217,12 @@ configs:
217217
userIDKey: email
218218
userNameKey: email
219219
# OIDC configuration as an alternative to dex (optional).
220-
# oidc.config: |
221-
# name: nsl
222-
# issuer: https://account.naturalselectionlabs.com/auth/realms/google
223-
# clientID: argocd
224-
# clientSecret: $oidc.keycloak.clientSecret
225-
# requestedScopes: ["openid", "profile", "email", "roles"]
220+
# oidc.config: |
221+
# name: nsl
222+
# issuer: https://account.naturalselectionlabs.com/auth/realms/google
223+
# clientID: argocd
224+
# clientSecret: $oidc.keycloak.clientSecret
225+
# requestedScopes: ["openid", "profile", "email", "roles"]
226226
# rootCA: |
227227
# -----BEGIN CERTIFICATE-----
228228
# ... encoded certificate data here ...
@@ -234,11 +234,11 @@ configs:
234234
# - openid
235235
# - profile
236236
# - email
237-
# resource.customizations.ignoreDifferences.all: |
238-
# managedFieldsManagers:
239-
# - kube-controller-manager
240-
# jqPathExpressions:
241-
# - .spec.replicas
237+
# resource.customizations.ignoreDifferences.all: |
238+
# managedFieldsManagers:
239+
# - kube-controller-manager
240+
# jqPathExpressions:
241+
# - .spec.replicas
242242
resource.customizations.ignoreDifferences.apps_Deployment: |
243243
jqPathExpressions:
244244
- .spec.template.spec.initContainers[].resources
@@ -271,7 +271,7 @@ configs:
271271
command:
272272
- sh
273273
- "-c"
274-
- "kustomize edit set annotation \"github.com/url:${ARGOCD_ENV_APP_REPO}\"; kustomize edit set image ${ARGOCD_ENV_IMAGE_NAME}:${ARGOCD_ENV_IMAGE_TAG}; kustomize build --enable-helm . | argocd-vault-plugin -s ${ARGOCD_ENV_AVP_SECRET} generate -"
274+
- 'kustomize edit set annotation "github.com/url:${ARGOCD_ENV_APP_REPO}"; kustomize edit set image ${ARGOCD_ENV_IMAGE_NAME}:${ARGOCD_ENV_IMAGE_TAG}; kustomize build --enable-helm . | argocd-vault-plugin -s ${ARGOCD_ENV_AVP_SECRET} generate -'
275275
lockRepo: false
276276
rbac:
277277
# -- Create the argocd-rbac-cm configmap with ([Argo CD RBAC policy]) definitions.
@@ -280,11 +280,11 @@ configs:
280280
create: true
281281

282282
# -- Annotations to be added to argocd-rbac-cm configmap
283-
annotations: { }
283+
annotations: {}
284284

285285
# -- The name of the default role which Argo CD will falls back to, when authorizing API requests (optional).
286286
# If omitted or empty, users may be still be able to login, but will see no apps, projects, etc...
287-
policy.default: 'role:readonly'
287+
policy.default: "role:readonly"
288288

289289
# -- File containing user-defined policies and role definitions.
290290
# @default -- `''` (See [values.yaml])
@@ -351,4 +351,4 @@ configs:
351351
img.sidebar__logo__character {
352352
width: 60px !important;
353353
content: url("https://avatars.githubusercontent.com/u/152575164?s=200&v=4") !important;
354-
}
354+
}

0 commit comments

Comments
 (0)