Layer ordering #364
Layer ordering #364
Conversation
| Name: helmRepo.ObjectMeta.Name, | ||
| Namespace: helmRepo.ObjectMeta.Namespace, | ||
|
|
||
| var names []string |
There was a problem hiding this comment.
nit - the variable name 'names' took me a minute to realize this was the name of the layers.
There was a problem hiding this comment.
Yeah, there's a lot going on in this function, I've renamed it to layerNames.
| }, | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: helmv2beta1.GroupVersion.Identifier(), | ||
| Kind: helmv2beta1.HelmReleaseKind, |
There was a problem hiding this comment.
Thoughts on adding a label with the layer value? It will be useful to be able to select all HRs for a particular layer.
| } | ||
| } | ||
|
|
||
| sort.Slice(releases, func(i, j int) bool { return releases[i].GetName() < releases[j].GetName() }) |
There was a problem hiding this comment.
Can you add some details on the sort here? Based on the function I would expect the sort to be layer, name instead of just name.
There was a problem hiding this comment.
The sort here is just used to make testing easier, the generated HelmReleases would be applied "simultaneously" because they're written to the same file.
| } | ||
|
|
||
| helmReleases, err := charts.MakeHelmReleasesInLayers(clusterName, "wego-system", installs) |
There was a problem hiding this comment.
Future work - we need to enable a namespace other than wego-system.
There was a problem hiding this comment.
I used wego-system because that's what the original mechanism was using, but definitely yes.
I was trying to ensure that this was a drop-in replacement for the existing code :-)
bigkevmcd
force-pushed
the
layer-ordering
branch
2 times, most recently
from
5e919f5 to
86f5034
Compare
| @@ -1220,7 +1302,7 @@ func createServer(clusterState []runtime.Object, configMapName, namespace string | |||
| } | |||
|
|
|||
| func createDatabase(t *testing.T) *gorm.DB { | |||
| db, err := utils.OpenDebug("", true) | |||
| db, err := utils.OpenDebug("", os.Getenv("DEBUG_SERVER_DB") == "true") | |||
bigkevmcd
force-pushed
the
layer-ordering
branch
from
e5c9d22 to
139bb26
Compare
Empty layer dependency. Rework to simplify the creation without having to have Charts. Update the protobuf to accept the layer. Fix the rename function failure.
Don't debug log from database.
Co-authored-by: Mark Emeis <[email protected]>
bigkevmcd
force-pushed
the
layer-ordering
branch
from
139bb26 to
83dc5eb
Compare
This PR implements ordering of the generated HelmReleases.
Profile helm charts can be annotated with
weave.works/layer: layer-name.Charts with metadata annotations are ordered based on a sorted version of the layers.
For example, if two Profile charts are being installed in
layer-0andlayer-1, the charts with declaredlayer-1will be configured asdependsOnthe chart inlayer-0.