This repository has been archived by the owner on Nov 1, 2022. It is now read-only.
Link helm-created resources to FluxHelmReleases #1134
Merged
Conversation
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
aaron7
approved these changes
Jun 19, 2018
integrations/helm/status/status.go
Outdated
|
|
||
| // Get the corresponding HelmRelease status | ||
| // Annotate/Status things | ||
| // (will probably need to keep a worklist) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
| for { | ||
| select { | ||
| case <-stop: | ||
| break bail |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
integrations/helm/status/status.go
Outdated
| default: | ||
| } | ||
|
|
||
| if err := a.rateLimiter.Wait(ctx); err != nil { |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
@aaron7 Wanna check the fixups? Then I'll squash them and meeerge. |
Some cosmetic changes to smooth the way. - remove dead wood - remove redundant allocations - dedup getting release - use return type *T rather than derefing *T
This introduces a loop which checks each FluxHelmRelease and updates its status depending on the status of its corresponding Helm release. This is so that you (or the Flux API) can see from just the FHR what is happening.
We want to be able to identify the resources created, indirectly, by a FluxHelmRelease. We don't get access to the creation process, since that's managed by Helm; but we do get to see, afterwards, which resources were involved, in a big YAML string. The simplest way to get the annotation done is to hand the big YAML string directly to `kubectl annotate`.
To present the annotation in the flux API, I've added a field to the API response. - rename the annotation to `antecedent` (meaning something that logically precedes), since we already use "cause" elsewhere, albeit not as an annotation - minorly refactor the way controllers (workloads) from the cluster are converted into cluster.Controller values
squaremo
force-pushed
the
issue/1109-link-helm-resources
branch
from
8daf5d0 to
0ff33b1
Compare
This was referenced Jun 26, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This does two things:
it records the "release status" of a Helm release that corresponds to a FluxHelmRelease, in the FluxHelmRelease
it marks each resource that's created as a consequence of a FluxHelmRelease as linked to that FHR. This is then included in the ListControllers response in the API, as the field
Antecedent, in the form of a stringified resource ID.For example,
[ { "ID": "default:deployment/default-mariadb-mariadb", "Containers": [ { "Name": "mariadb", "Current": { "ID": "bitnami/mariadb:_" }, "LatestFiltered": { "ID": "" } } ], "ReadOnly": "NotInRepo", "Status": "ready", "Antecedent": "default:fluxhelmrelease/mariadb", "Labels": { "app": "default-mariadb-mariadb", "chart": "mariadb-2.1.3", "heritage": "Tiller", "release": "default-mariadb" }, "Automated": false, "Locked": false, "Ignore": false, "Policies": {} }, { "ID": "default:fluxhelmrelease/mariadb", "Containers": [ { "Name": "chart-image", "Current": { "ID": "bitnami/mariadb:_" }, "LatestFiltered": { "ID": "" } } ], "ReadOnly": "", "Status": "DEPLOYED", "Antecedent": "", "Labels": { "chart": "mariadb" }, "Automated": true, "Locked": false, "Ignore": false, "Policies": { "automated": "true" } } ]