Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Add 'fluxctl install' e2e smoke test #2552

Merged
merged 5 commits into from
Oct 25, 2019
Merged

Conversation

2opremio
Copy link
Contributor

Also:

  • Factor out polling machinery
  • Reduce the polling interval during e2e tests so that they don't take as long

kubectl -n "${FLUX_NAMESPACE}" rollout status deployment/flux
# Add the known hosts file manually (it's much easier than editing the manifests to add a volume)
local flux_podname=$(kubectl get pod -n flux-e2e -l name=flux -o jsonpath="{['items'][0].metadata.name}")
kubectl exec -n "${FLUX_NAMESPACE}" "${flux_podname}" -- sh -c "echo '$(cat ${FIXTURES_DIR}/known_hosts)' > /root/.ssh/known_hosts"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pretty horrible. I'm open for suggestions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment is also aimed at the sed expressions above (I tried to make a comment on the full block of code but it seems I failed)

Copy link
Member

@hiddeco hiddeco Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't the install package already support additionalArguments? What about instead of doing the sed, we make a small adjustment to fluxctl install to accept a string slice of additional arguments, and then utilize this here?


There actually was someone on Slack yesterday who was wondering how he could use his own image with fluxctl install. So maybe adding an option to supply an own image to fluxctl install wouldn't even be a bad idea.

Copy link
Contributor Author

@2opremio 2opremio Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like your suggestions. I initially incorporated --extra-flux-arguments, but @squaremo thought it was better to edit the output. See #2287 (review)

@squaremo I still think there is a valid usecase here, could you reevaluate?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hiddeco regardless, I will fix this in a separate PR. Are you OK with the rest?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to run the output of fluxctl install through kustomize to do the patching you need?

Copy link
Member

@hiddeco hiddeco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Fons, awesome progression 🌷

@2opremio 2opremio merged commit 8277900 into fluxcd:master Oct 25, 2019
@2opremio 2opremio deleted the improve-e2e-test branch October 25, 2019 13:47
@2opremio 2opremio added this to the 1.16.0 milestone Nov 21, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants