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.

Sign up for GitHub

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

Jump to bottom

install: Remove --base-version flag #891

Merged
merged 1 commit into from
Jun 7, 2022
Merged

install: Remove --base-version flag #891

merged 1 commit into from
Jun 7, 2022

Conversation

michi-covalent
Copy link
Contributor

  • Resolve Cilium version from --version / --chart-directory flags by
    looking up the chart version instead of relying on --base-version.
  • Persist the version in cilium-cli-helm-values secret. This allows
    subsequent hubble / connectivity commands to retrieve the running
    Cilium version instead of relying on users to specify it.

Signed-off-by: Michi Mutsuzaki michi@isovalent.com

@michi-covalent michi-covalent requested review from a team as code owners June 3, 2022 03:54
@michi-covalent michi-covalent temporarily deployed to ci June 3, 2022 03:54 Inactive
@michi-covalent
Copy link
Contributor Author

i'll remove --base-version flag from hubble and connectivity commands after this one gets merged.

some sample outputs:

# bad chart path

% ./cilium install --chart-directory /invalid/path
failed to load Helm chart directory /invalid/path: Chart.yaml file is missing

# bad version

% ./cilium install --version v0.1.2
cilium version not found: open cilium-0.1.2.tgz: file does not exist

# good chart path

% ./cilium install --chart-directory ../cilium/install/kubernetes/cilium
🔮 Auto-detected Kubernetes kind: minikube
✨ Running "minikube" validation checks
✅ Detected minikube version "1.25.2"
ℹ️  Using Cilium version 1.11.90
...

# good version

% ./cilium install --version v1.11.4
🔮 Auto-detected Kubernetes kind: minikube
✨ Running "minikube" validation checks
✅ Detected minikube version "1.25.2"
ℹ️  Using Cilium version 1.11.4

@michi-covalent michi-covalent temporarily deployed to ci June 3, 2022 04:02 Inactive
@michi-covalent michi-covalent temporarily deployed to ci June 3, 2022 04:13 Inactive
@michi-covalent michi-covalent temporarily deployed to ci June 3, 2022 04:20 Inactive
tklauser
tklauser reviewed Jun 3, 2022
View reviewed changes
internal/cli/cmd/install.go Outdated Show resolved Hide resolved
internal/helm/helm_test.go Outdated Show resolved Hide resolved
@michi-covalent
install: Remove --base-version flag
f990b4d 
- Resolve Cilium version from --version / --chart-directory flags by
  looking up the chart version instead of relying on --base-version.
- Persist the version in cilium-cli-helm-values secret. This allows
  subsequent hubble / connectivity commands to retrieve the running
  Cilium version instead of relying on users to specify it.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@michi-covalent michi-covalent temporarily deployed to ci June 3, 2022 15:46 Inactive
@michi-covalent
Copy link
Contributor Author

alright i'm merging this, this PR doesn't contain any azure specific changes.

@michi-covalent michi-covalent merged commit 3203b4d into master Jun 7, 2022
@michi-covalent michi-covalent deleted the pr/michi/no-more-base-version branch June 7, 2022 17:47
@nbusseneau nbusseneau mentioned this pull request Jun 15, 2022
Merged
3 tasks
nbusseneau added a commit to cilium/cilium that referenced this pull request Jun 15, 2022
@nbusseneau
ci: use CLI 0.11.8 for AKS workflow
d3b5626 
CLI version 0.11.8 adds support for BYOCNI:
https://github.com/cilium/cilium-cli/releases/tag/v0.11.8

Note that in order to use CLI 0.11.8, the `base-version` flags had to be
removed due to cilium/cilium-cli#890 +
cilium/cilium-cli#891,
and we also had to use manual `kubectl port-forward` instead of
`cilium hubble port-forward` because we seemingly broke that in the
process. This is going to be fixed in a later release of the CLI, but
for now we can get away with it.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
tklauser added a commit to cilium/cilium that referenced this pull request Jun 16, 2022
@tklauser
ci: pick up cilium-cli v0.11.9 for master/v1.11 workflows
b3afeab 
The --base-version flag is no longer necessary and has been deprecated,
see cilium/cilium-cli#891 for details.

Release notes: https://github.com/cilium/cilium-cli/releases/tag/v0.11.9

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser mentioned this pull request Jun 16, 2022
Merged
tklauser added a commit to cilium/cilium that referenced this pull request Jun 17, 2022
@tklauser
ci: pick up cilium-cli v0.11.9 for master/v1.11 workflows
050a94b 
The --base-version flag is no longer necessary and has been deprecated,
see cilium/cilium-cli#891 for details.

Release notes: https://github.com/cilium/cilium-cli/releases/tag/v0.11.9

Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser added a commit to cilium/cilium that referenced this pull request Jun 20, 2022
@tklauser
ci: pick up cilium-cli v0.11.9 for master/v1.11 workflows
fa67958 
The --base-version flag is no longer necessary and has been deprecated,
see cilium/cilium-cli#891 for details.

Release notes: https://github.com/cilium/cilium-cli/releases/tag/v0.11.9

Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser added a commit to cilium/cilium that referenced this pull request Jun 21, 2022
@tklauser
ci: pick up cilium-cli v0.11.9 for master/v1.11 workflows
4139b32 
The --base-version flag is no longer necessary and has been deprecated,
see cilium/cilium-cli#891 for details.

Release notes: https://github.com/cilium/cilium-cli/releases/tag/v0.11.9

Signed-off-by: Tobias Klauser <tobias@cilium.io>
kkourt pushed a commit to cilium/cilium that referenced this pull request Jun 21, 2022
@tklauser @kkourt
ci: pick up cilium-cli v0.11.9 for master/v1.11 workflows
135f522 
The --base-version flag is no longer necessary and has been deprecated,
see cilium/cilium-cli#891 for details.

Release notes: https://github.com/cilium/cilium-cli/releases/tag/v0.11.9

Signed-off-by: Tobias Klauser <tobias@cilium.io>
aanm pushed a commit to cilium/cilium that referenced this pull request Jun 21, 2022
@nbusseneau @aanm
ci: use CLI 0.11.8 for AKS workflow
598d884 
CLI version 0.11.8 adds support for BYOCNI:
https://github.com/cilium/cilium-cli/releases/tag/v0.11.8

Note that in order to use CLI 0.11.8, the `base-version` flags had to be
removed due to cilium/cilium-cli#890 +
cilium/cilium-cli#891,
and we also had to use manual `kubectl port-forward` instead of
`cilium hubble port-forward` because we seemingly broke that in the
process. This is going to be fixed in a later release of the CLI, but
for now we can get away with it.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
aanm pushed a commit to cilium/cilium that referenced this pull request Jun 21, 2022
@nbusseneau @aanm
ci: use CLI 0.11.8 for AKS workflow
1ffa176 
CLI version 0.11.8 adds support for BYOCNI:
https://github.com/cilium/cilium-cli/releases/tag/v0.11.8

Note that in order to use CLI 0.11.8, the `base-version` flags had to be
removed due to cilium/cilium-cli#890 +
cilium/cilium-cli#891,
and we also had to use manual `kubectl port-forward` instead of
`cilium hubble port-forward` because we seemingly broke that in the
process. This is going to be fixed in a later release of the CLI, but
for now we can get away with it.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@tklauser tklauser mentioned this pull request Jun 28, 2022
Closed
dezmodue pushed a commit to dezmodue/cilium that referenced this pull request Aug 10, 2022
@nbusseneau @dezmodue
ci: use CLI 0.11.8 for AKS workflow
f5d0f25 
CLI version 0.11.8 adds support for BYOCNI:
https://github.com/cilium/cilium-cli/releases/tag/v0.11.8

Note that in order to use CLI 0.11.8, the `base-version` flags had to be
removed due to cilium/cilium-cli#890 +
cilium/cilium-cli#891,
and we also had to use manual `kubectl port-forward` instead of
`cilium hubble port-forward` because we seemingly broke that in the
process. This is going to be fixed in a later release of the CLI, but
for now we can get away with it.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
nbusseneau pushed a commit to nbusseneau/cilium that referenced this pull request Aug 10, 2022
@tklauser @nbusseneau
ci: pick up cilium-cli v0.11.9 for master/v1.11 workflows
eff20cd 
[ upstream commit 135f522 ]

The --base-version flag is no longer necessary and has been deprecated,
see cilium/cilium-cli#891 for details.

Release notes: https://github.com/cilium/cilium-cli/releases/tag/v0.11.9

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
tklauser added a commit to cilium/cilium that referenced this pull request Aug 11, 2022
@tklauser
ci: pick up cilium-cli v0.11.9 for master/v1.11 workflows
623e3af 
[ upstream commit 135f522 ]

The --base-version flag is no longer necessary and has been deprecated,
see cilium/cilium-cli#891 for details.

Release notes: https://github.com/cilium/cilium-cli/releases/tag/v0.11.9

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twpayne twpayne twpayne approved these changes

@tklauser tklauser tklauser approved these changes

@ti-mo ti-mo Awaiting requested review from ti-mo ti-mo was automatically assigned from cilium/azure

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@michi-covalent @twpayne @tklauser