feat: enable ingress and upgrade arogcd (#40)

* feat: enable ingress, upgrade arogcd, add auth for upbound * yamllint * remove auth to up * re-add needed vars for CNOE
upbound · Jun 4, 2024 · 672584f · 672584f
1 parent d5fb365
commit 672584f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/apis/composition.yaml b/apis/composition.yaml
@@ -214,6 +214,8 @@ spec:
                       autoscaling:
                         enabled: true
                         minReplicas: 1
+                      ingress:
+                        enabled: true
                       metrics:
                         enabled: true
                         service:
@@ -226,11 +228,12 @@ spec:
                         requests:
                           cpu: 100m
                           memory: 256Mi
-                      service:
-                        type: LoadBalancer
             patches:
               - type: PatchSet
                 patchSetName: Common
+              - type: FromCompositeFieldPath
+                fromFieldPath: spec.parameters.ingressUrl
+                toFieldPath: spec.forProvider.values.global.domain
               - type: FromCompositeFieldPath
                 fromFieldPath: spec.parameters.ingressUrl
                 toFieldPath: spec.forProvider.values.server.url

diff --git a/apis/definition.yaml b/apis/definition.yaml
@@ -61,7 +61,7 @@ spec:
                       type: object
                       default:
                         argocd:
-                          version: "5.51.1"
+                          version: "7.1.1"
                       properties:
                         argocd:
                           description: Configuration for the ArgoCD operator.
@@ -70,7 +70,7 @@ spec:
                             version:
                               description: ArgoCD helm-chart version to run.
                               type: string
-                              default: "5.51.1"
+                              default: "7.1.1"
                           required:
                             - version
                     source: