-
Notifications
You must be signed in to change notification settings - Fork 229
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
Fix extraEnv in gitjob controller template #2650
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,15 @@ jobs: | |
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - | ||
| name: Set up chart-testing | ||
| uses: helm/[email protected] | ||
| with: | ||
| version: v3.3.0 | ||
| - | ||
| name: Run chart-testing (lint) | ||
| run: ct lint --all --validate-maintainers=false charts/ | ||
| - | ||
| uses: actions/setup-go@v5 | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| .helmignore | ||
| ci/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| apiServerURL: "https://localhost" | ||
| apiServerCA: "abc" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| .helmignore | ||
| ci/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| bootstrap: | ||
| enabled: true | ||
|
|
||
| global: | ||
| cattle: | ||
| systemDefaultRegistry: "ghcr.io" | ||
|
|
||
| nodeSelector: | ||
| kubernetes.io/os: os2 | ||
|
|
||
| tolerations: | ||
| - key: node.cloudprovider.kubernetes.io/uninitialized | ||
| operator: "Equal" | ||
| value: "true" | ||
| effect: NoSchedule | ||
|
|
||
| priorityClassName: "prio1" | ||
|
|
||
| gitops: | ||
| enabled: true | ||
|
|
||
| metrics: | ||
| enabled: true | ||
|
|
||
| debug: true | ||
| debugLevel: 4 | ||
| propagateDebugSettingsToAgents: true | ||
|
|
||
| cpuPprof: | ||
| period: "60s" | ||
| volumeConfiguration: | ||
| hostPath: | ||
| path: /tmp/pprof | ||
| type: DirectoryOrCreate | ||
|
|
||
| migrations: | ||
| clusterRegistrationCleanup: true | ||
|
|
||
| leaderElection: | ||
| leaseDuration: 30s | ||
| retryPeriod: 10s | ||
| renewDeadline: 25s | ||
|
|
||
| controller: | ||
| reconciler: | ||
| workers: | ||
| gitrepo: "1" | ||
| bundle: "1" | ||
| bundledeployment: "1" | ||
|
|
||
| extraEnv: | ||
| - name: EXPERIMENTAL_OCI_STORAGE | ||
| value: "true" | ||
|
|
||
| shards: | ||
| - id: shard0 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-0 | ||
| - id: shard1 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-1 | ||
| - id: shard2 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-2 |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| bootstrap: | ||
| enabled: false | ||
|
|
||
| global: | ||
| cattle: | ||
| systemDefaultRegistry: "ghcr.io" | ||
|
|
||
| nodeSelector: | ||
| kubernetes.io/os: mac | ||
|
|
||
| tolerations: | ||
| - key: node.cloudprovider.kubernetes.io/uninitialized | ||
| operator: "Equal" | ||
| value: "true" | ||
| effect: NoSchedule | ||
|
|
||
| priorityClassName: "prio1" | ||
|
|
||
| gitops: | ||
| enabled: true | ||
|
|
||
| metrics: | ||
| enabled: true | ||
|
|
||
| debug: false | ||
| debugLevel: 4 | ||
| propagateDebugSettingsToAgents: true | ||
|
|
||
| cpuPprof: | ||
| period: "60s" | ||
| volumeConfiguration: | ||
| hostPath: | ||
| path: /tmp/pprof | ||
| type: DirectoryOrCreate | ||
|
|
||
| migrations: | ||
| clusterRegistrationCleanup: true | ||
|
|
||
| leaderElection: | ||
| leaseDuration: 30s | ||
| retryPeriod: 10s | ||
| renewDeadline: 25s | ||
|
|
||
| controller: | ||
| reconciler: | ||
| workers: | ||
| gitrepo: "1" | ||
| bundle: "1" | ||
| bundledeployment: "1" | ||
|
|
||
| extraEnv: | ||
| - name: EXPERIMENTAL_OCI_STORAGE | ||
| value: "true" | ||
|
|
||
| shards: | ||
| - id: shard0 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-0 | ||
| - id: shard1 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-1 | ||
| - id: shard2 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| bootstrap: | ||
| enabled: true | ||
|
|
||
| global: | ||
| cattle: | ||
| systemDefaultRegistry: "ghcr.io" | ||
|
|
||
| nodeSelector: | ||
| kubernetes.io/os: plan9 | ||
|
|
||
| tolerations: | ||
| - key: node.cloudprovider.kubernetes.io/uninitialized | ||
| operator: "Equal" | ||
| value: "true" | ||
| effect: NoSchedule | ||
|
|
||
| priorityClassName: "prio1" | ||
|
|
||
| gitops: | ||
| enabled: true | ||
|
|
||
| metrics: | ||
| enabled: true | ||
|
|
||
| debug: false | ||
| debugLevel: 4 | ||
| propagateDebugSettingsToAgents: true | ||
|
|
||
| cpuPprof: | ||
| period: "60s" | ||
| volumeConfiguration: | ||
| hostPath: | ||
| path: /tmp/pprof | ||
| type: DirectoryOrCreate | ||
|
|
||
| migrations: | ||
| clusterRegistrationCleanup: true | ||
|
|
||
| leaderElection: | ||
| leaseDuration: 30s | ||
| retryPeriod: 10s | ||
| renewDeadline: 25s | ||
|
|
||
| controller: | ||
| reconciler: | ||
| workers: | ||
| gitrepo: "1" | ||
| bundle: "1" | ||
| bundledeployment: "1" | ||
|
|
||
| extraEnv: | ||
| - name: EXPERIMENTAL_OCI_STORAGE | ||
| value: "true" | ||
|
|
||
| shards: | ||
| - id: shard0 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-0 | ||
| - id: shard1 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-1 | ||
| - id: shard2 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| bootstrap: | ||
| enabled: true | ||
|
|
||
| global: | ||
| cattle: | ||
| systemDefaultRegistry: "ghcr.io" | ||
|
|
||
| nodeSelector: | ||
| kubernetes.io/os: winxp | ||
|
|
||
| tolerations: | ||
| - key: node.cloudprovider.kubernetes.io/uninitialized | ||
| operator: "Equal" | ||
| value: "true" | ||
| effect: NoSchedule | ||
|
|
||
| priorityClassName: "prio1" | ||
|
|
||
| gitops: | ||
| enabled: false | ||
|
|
||
| metrics: | ||
| enabled: true | ||
|
|
||
| debug: false | ||
| debugLevel: 4 | ||
| propagateDebugSettingsToAgents: true | ||
|
|
||
| cpuPprof: | ||
| period: "60s" | ||
| volumeConfiguration: | ||
| hostPath: | ||
| path: /tmp/pprof | ||
| type: DirectoryOrCreate | ||
|
|
||
| migrations: | ||
| clusterRegistrationCleanup: true | ||
|
|
||
| leaderElection: | ||
| leaseDuration: 30s | ||
| retryPeriod: 10s | ||
| renewDeadline: 25s | ||
|
|
||
| controller: | ||
| reconciler: | ||
| workers: | ||
| gitrepo: "1" | ||
| bundle: "1" | ||
| bundledeployment: "1" | ||
|
|
||
| extraEnv: | ||
| - name: EXPERIMENTAL_OCI_STORAGE | ||
| value: "true" | ||
|
|
||
| shards: | ||
| - id: shard0 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-0 | ||
| - id: shard1 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-1 | ||
| - id: shard2 | ||
| nodeSelector: | ||
| kubernetes.io/hostname: k3d-upstream-server-2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would this file, and other files under
charts/fleet{-agent,}/ciend up being packaged in our charts?Should we add
.helmignorefiles to those charts to prevent that?Apart from that, I'm sligthly concerned about the maintenance overhead of those values files when we add new features involving such values: it looks likely to me that we may forget to update at least some of them to reflect the latest available values.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, added those
.helmignorefiles. The actual values in those files don't matter much. I think chart-testing just checks that the result is valid YAML. Not sure if we will ever be able to cover all combinations, but at least this bug would have been catched by the one file with "debug: false".