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

Set CILIUM_CLI_MODE env variable at the top level #26404

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Set CILIUM_CLI_MODE env variable at the top level #26404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/conformance-aws-cni.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ env:
# renovate: datasource=github-releases depName=cilium/cilium-cli
cilium_cli_version: v0.14.7
cilium_cli_ci_version:
CILIUM_CLI_MODE: helm
check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
eksctl_version: v0.143.0
kubectl_version: v1.27.2
Expand Down Expand Up @@ -321,7 +322,7 @@ jobs:

- name: Install Cilium
run: |
CILIUM_CLI_MODE=helm cilium install ${{ steps.vars.outputs.cilium_install_defaults }}
cilium install ${{ steps.vars.outputs.cilium_install_defaults }}

- name: Wait for Cilium to be ready
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/conformance-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,8 @@ jobs:
--from-literal=keys="3 rfc4106(gcm(aes)) $(echo $(dd if=/dev/urandom count=20 bs=1 2> /dev/null | xxd -p -c 64)) 128"
fi

CILIUM_CLI_MODE=helm ./cilium-cli install ${{ steps.vars.outputs.cilium_install_defaults }}
export CILIUM_CLI_MODE=helm
./cilium-cli install ${{ steps.vars.outputs.cilium_install_defaults }}
kubectl -n cilium-spire wait --for=condition=Ready pod -l app=spire-server --timeout=300s
kubectl -n cilium-spire wait --for=condition=Ready pod -l app=spire-agent --timeout=300s

Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/conformance-eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ env:
# renovate: datasource=github-releases depName=cilium/cilium-cli
cilium_cli_version: v0.14.7
cilium_cli_ci_version:
CILIUM_CLI_MODE: helm
check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
eksctl_version: v0.143.0
kubectl_version: v1.27.2
Expand Down Expand Up @@ -314,7 +315,7 @@ jobs:

- name: Install Cilium
run: |
CILIUM_CLI_MODE=helm cilium install ${{ steps.vars.outputs.cilium_install_defaults }}
cilium install ${{ steps.vars.outputs.cilium_install_defaults }}

- name: Wait for Cilium to be ready
run: |
Expand All @@ -340,7 +341,7 @@ jobs:
- name: Clean up Cilium
run: |
pkill -f "cilium.*hubble.*port-forward|kubectl.*port-forward.*hubble-relay"
cilium uninstall --chart-directory=install/kubernetes/cilium --wait
cilium uninstall --wait

- name: Create custom IPsec secret
run: |
Expand All @@ -349,7 +350,8 @@ jobs:
- name: Install Cilium with encryption
run: |
cilium install ${{ steps.vars.outputs.cilium_install_defaults }} \
--encryption=ipsec
--helm-set encryption.enabled=true \
--helm-set encryption.type=ipsec

- name: Wait for Cilium to be ready
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/conformance-gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ env:
# renovate: datasource=github-releases depName=cilium/cilium-cli
cilium_cli_version: v0.14.7
cilium_cli_ci_version:
CILIUM_CLI_MODE: helm
check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
USE_GKE_GCLOUD_AUTH_PLUGIN: True

Expand Down Expand Up @@ -335,7 +336,7 @@ jobs:

- name: Install Cilium
run: |
CILIUM_CLI_MODE=helm cilium install ${{ steps.vars.outputs.cilium_install_defaults }} ${{ matrix.config.cilium-install-opts }}
cilium install ${{ steps.vars.outputs.cilium_install_defaults }} ${{ matrix.config.cilium-install-opts }}

- name: Wait for Cilium to be ready
run: |
Expand Down