Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add extraValueFiles to operator-install chart #342

Merged
merged 3 commits into from
Aug 16, 2023

Conversation

mhjacks
Copy link
Contributor

@mhjacks mhjacks commented Aug 15, 2023

No description provided.

@mbaldessari
Copy link
Contributor

I think you also want:

diff --git a/clustergroup/values.schema.json b/clustergroup/values.schema.json
index e64a812..b1359a3 100644
--- a/clustergroup/values.schema.json
+++ b/clustergroup/values.schema.json
@@ -83,6 +83,10 @@
             }
           }
         },
+        "extraValueFiles": {
+          "type": "array",
+          "description": "List of extra values files that will be passed to ArgoCD."
+        },
         "gitops": {
           "type": "object",
           "additionalProperties": false,

Or something along those lines anyways

@mhjacks
Copy link
Contributor Author

mhjacks commented Aug 15, 2023

Do we need to talk about whether those extraValueFiles are "main" or "global"? It seems like they should be "global" since I think we intend them to also apply to subsequent applications?

@mbaldessari
Copy link
Contributor

Yeah so I never really liked that main vs global distinction. In theory as far as I understood things 'main' is for things passed at 'make install' time and global is everything else. I think the distinction is non obvious so I would not hate the idea of just moving towards global

@mhjacks
Copy link
Contributor Author

mhjacks commented Aug 16, 2023

I've updated the PR:

We're using .Values.global.extraValueFiles now per discussion in slack. I've added logic to the helper template in ACM, but the tests are failing - I wanted some advice on how to fix that since it is unlike the other elements added in the ACM helper. Currently, the test is failing this way:

Testing acm chart (industrial-edge-hub) with opts [-f values-global.yaml --set global.repoURL=https://github.com/pattern-clone/mypattern --set main.git.repoURL=https://github.com/pattern-clone/mypattern --set main.git.revision=main --set global.pattern=mypattern --set global.namespace=pattern-namespace --set global.hubClusterDomain=apps.hub.example.com --set global.localClusterDomain=apps.region.example.com --set global.clusterDomain=region.example.com --set clusterGroup.imperative.jobs[0].name=test --set clusterGroup.imperative.jobs[0].playbook=ansible/test.yml -f common/examples/industrial-edge-hub.yaml]
Error: template: acm/templates/policies/application-policies.yaml:46:26: executing "acm/templates/policies/application-policies.yaml" at <include "acm.app.policies.valuefiles" .>: error calling include: template: acm/templates/_helpers.tpl:13:8: executing "acm.app.policies.valuefiles" at <$.Values.global.extraValueFiles>: nil pointer evaluating interface {}.global

Is the right thing here stubbing out .Values.global.extraValueFiles or something else?

@mhjacks mhjacks merged commit aee8999 into validatedpatterns:main Aug 16, 2023
3 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants