revert accidentally committed files

wmde · Nov 27, 2024 · 48eab91 · 48eab91
1 parent 72dbc53
commit 48eab91
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/k8s/helmfile/env/production/argo-cd-base.values.yaml.gotmpl b/k8s/helmfile/env/production/argo-cd-base.values.yaml.gotmpl
@@ -42,6 +42,7 @@ configs:
 controller:
   resources:
    limits:
+     cpu: null
      memory: 512Mi
    requests:
      cpu: 250m
@@ -50,6 +51,7 @@ controller:
 applicationSet:
   resources:
     limits:
+      cpu: null
       memory: 128Mi
     requests:
       cpu: 100m
@@ -58,6 +60,7 @@ applicationSet:
 dex:
   resources:
    limits:
+     cpu: null
      memory: 64Mi
    requests:
      cpu: 10m
@@ -66,6 +69,7 @@ dex:
 notifications:
   resources:
     limits:
+      cpu: null
       memory: 128Mi
     requests:
       cpu: 100m
@@ -74,6 +78,7 @@ notifications:
 redis:
   resources:
    limits:
+     cpu: null
      memory: 128Mi
    requests:
      cpu: 100m
@@ -82,6 +87,7 @@ redis:
 repoServer:
   resources:
    limits:
+     cpu: null
      memory: 1024Mi
    requests:
      cpu: 10m

diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
@@ -78,11 +78,11 @@ releases:
   # Only deploy the clusterissuers to production clusters for now, as they won't
   # work locally for now...
   - name: clusterissuers
-    # installed: {{ ne .Environment.Name "local" | toYaml }}
+    installed: {{ ne .Environment.Name "local" | toYaml }}
     namespace: cert-manager
     # TODO use something more generic or from wbstack/charts repo
-    chart: ../../../charts/charts/wikibase-cloud-clusterissuers
-    # version: 0.1.0
+    chart: wbstack/wikibase-cloud-clusterissuers
+    version: 0.1.0
     values:
       - email: {{ .Values.external.letsencrypt.email }}
       - gceProject: {{ .Values.gceProject }}
@@ -96,10 +96,10 @@ releases:
               - 'wikibase.dev'
 
   - name: certificates
-    # installed: {{ ne .Environment.Name "local" | toYaml }}
+    installed: {{ ne .Environment.Name "local" | toYaml }}
     namespace: default
-    chart: ../../../charts/charts/certificates
-    # version: 0.1.0
+    chart: wbstack/certificates
+    version: 0.1.0
     <<: *default_release
 
 
@@ -109,7 +109,7 @@ releases:
   - name: argocd-config
     namespace: argocd
     chart: wbstack/argocd-config
-    version: 1.0.9
+    version: '{{ if eq .Environment.Name "production" }} 1.0.9 {{ else }} 1.0.10 {{ end }}'
     <<: *default_release
 
   - name: redirects
@@ -133,12 +133,6 @@ releases:
     version: 10.5.0
     <<: *default_release
 
-  - name: ui
-    namespace: default
-    chart: wbstack/ui
-    version: 0.3.1
-    <<: *default_release
-
   - name: elasticsearch-2
     namespace: default
     chart: bitnami/elasticsearch