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

gha: Move to helm mode for aws-cni, eks, gke #25820

Merged
merged 3 commits into from
Jun 2, 2023
Merged

gha: Move to helm mode for aws-cni, eks, gke #25820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
942ec51
gha: Move to helm mode for aws-cni
sayboras Jun 1, 2023
1cfea47
gha: Move to helm mode for aws-eks
sayboras Jun 1, 2023
1207fe0
gha: Move to helm mode for gke
sayboras Jun 1, 2023
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
21 changes: 7 additions & 14 deletions .github/workflows/conformance-aws-cni.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,25 +165,21 @@ jobs:
--helm-set=clustermesh.apiserver.image.tag=${SHA} \
--helm-set=clustermesh.apiserver.image.useDigest=false \
--helm-set=hubble.relay.image.repository=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/hubble-relay-ci \
--helm-set=hubble.relay.enabled=true \
--helm-set=hubble.relay.image.tag=${SHA} \
--helm-set=enableIPv4Masquerade=false \
--helm-set=cni.chainingMode=aws-cni \
--helm-set=eni.enabled=false \
--helm-set=ipam.mode=cluster-pool \
--helm-set=routingMode=native \
--helm-set=bandwidthManager.enabled=false \
--wait=false \
--rollback=false \
--config monitor-aggregation=none \
--version="
HUBBLE_ENABLE_DEFAULTS="--chart-directory=install/kubernetes/cilium \
--relay-image=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/hubble-relay-ci:${SHA} \
--relay-version=${SHA}"
--helm-set=bpf.monitorAggregation=none \
--wait=false"

# L7 policies are not supported in chaining mode.
CONNECTIVITY_TEST_DEFAULTS="--flow-validation=disabled --hubble=false --collect-sysdump-on-failure \
--test '!fqdn,!l7' --external-target amazon.com --external-ip 1.0.0.1 --external-other-ip 1.1.1.1"
echo cilium_install_defaults=${CILIUM_INSTALL_DEFAULTS} >> $GITHUB_OUTPUT
echo hubble_enable_defaults=${HUBBLE_ENABLE_DEFAULTS} >> $GITHUB_OUTPUT
echo connectivity_test_defaults=${CONNECTIVITY_TEST_DEFAULTS} >> $GITHUB_OUTPUT
echo sha=${SHA} >> $GITHUB_OUTPUT
echo owner=${OWNER} >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -253,15 +249,12 @@ jobs:

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

- name: Enable Relay
run: |
cilium hubble enable ${{ steps.vars.outputs.hubble_enable_defaults }}
CILIUM_CLI_MODE=helm cilium install ${{ steps.vars.outputs.cilium_install_defaults }}

- name: Wait for Cilium status to be ready
- name: Wait for Cilium to be ready
run: |
cilium status --wait
kubectl get pods -n kube-system

- name: Port forward Relay
run: |
Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/conformance-eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,21 +161,17 @@ jobs:
--helm-set=clustermesh.apiserver.image.repository=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/clustermesh-apiserver-ci \
--helm-set=clustermesh.apiserver.image.tag=${SHA} \
--helm-set=clustermesh.apiserver.image.useDigest=false \
--helm-set=hubble.relay.enabled=true \
--helm-set=hubble.relay.image.repository=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/hubble-relay-ci \
--helm-set=hubble.relay.image.tag=${SHA} \
--helm-set loadBalancer.l7.backend=envoy \
--helm-set tls.secretsBackend=k8s \
--wait=false \
--rollback=false \
--config monitor-aggregation=none \
--version="
HUBBLE_ENABLE_DEFAULTS="--chart-directory=install/kubernetes/cilium \
--relay-image=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/hubble-relay-ci:${SHA} \
--relay-version=${SHA}"
--helm-set=bpf.monitorAggregation=none \
--wait=false"

CONNECTIVITY_TEST_DEFAULTS="--flow-validation=disabled --hubble=false --collect-sysdump-on-failure \
--external-target amazon.com"
echo cilium_install_defaults=${CILIUM_INSTALL_DEFAULTS} >> $GITHUB_OUTPUT
echo hubble_enable_defaults=${HUBBLE_ENABLE_DEFAULTS} >> $GITHUB_OUTPUT
echo connectivity_test_defaults=${CONNECTIVITY_TEST_DEFAULTS} >> $GITHUB_OUTPUT
echo sha=${SHA} >> $GITHUB_OUTPUT
echo owner=${OWNER} >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -246,13 +242,12 @@ jobs:

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

- name: Enable Relay
- name: Wait for Cilium to be ready
run: |
cilium hubble enable ${{ steps.vars.outputs.hubble_enable_defaults }}
# NB: necessary to work against occassional flakes due to https://github.com/cilium/cilium-cli/issues/918
cilium status --wait
kubectl get pods -n kube-system

- name: Port forward Relay
run: |
Expand All @@ -278,11 +273,10 @@ jobs:
cilium install ${{ steps.vars.outputs.cilium_install_defaults }} \
--encryption=ipsec

- name: Enable Relay
- name: Wait for Cilium to be ready
run: |
cilium hubble enable ${{ steps.vars.outputs.hubble_enable_defaults }}
# NB: necessary to work against occassional flakes due to https://github.com/cilium/cilium-cli/issues/918
cilium status --wait
kubectl get pods -n kube-system

- name: Port forward Relay
run: |
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/conformance-gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ jobs:
cilium-install-opts: "--datapath-mode=tunnel"
- type: "ipsec"
index: "3"
cilium-install-opts: "--encryption=ipsec"
cilium-install-opts: "--helm-set=encryption.enabled=true --helm-set=encryption.type=ipsec"
- type: "tunnel-ipsec"
index: "4"
cilium-install-opts: "--encryption=ipsec --datapath-mode=tunnel"
cilium-install-opts: "--helm-set=encryption.enabled=true --helm-set=encryption.type=ipsec --datapath-mode=tunnel"
name: installation-and-connectivity ${{ matrix.type }}

steps:
Expand Down Expand Up @@ -220,18 +220,15 @@ jobs:
--helm-set=clustermesh.apiserver.image.repository=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/clustermesh-apiserver-ci \
--helm-set=clustermesh.apiserver.image.tag=${SHA} \
--helm-set=clustermesh.apiserver.image.useDigest=false \
--helm-set=hubble.relay.enabled=true \
--helm-set=hubble.relay.image.repository=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/hubble-relay-ci \
--helm-set=hubble.relay.image.tag=${SHA} \
--helm-set=agentNotReadyTaintKey=ignore-taint.cluster-autoscaler.kubernetes.io/cilium-agent-not-ready \
--helm-set loadBalancer.l7.backend=envoy \
--helm-set tls.secretsBackend=k8s \
--wait=false \
--rollback=false \
--config monitor-aggregation=none \
--version="
HUBBLE_ENABLE_DEFAULTS="--chart-directory=install/kubernetes/cilium \
--relay-image=quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/hubble-relay-ci:${SHA} \
--relay-version=${SHA}"
--helm-set=bpf.monitorAggregation=none \
--wait=false"

CONNECTIVITY_TEST_DEFAULTS="--flow-validation=disabled --hubble=false --collect-sysdump-on-failure \
--external-target google.com --external-cidr 8.0.0.0/8 --external-ip 8.8.8.8 --external-other-ip 8.8.4.4"
echo cilium_install_defaults=${CILIUM_INSTALL_DEFAULTS} >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -308,11 +305,12 @@ jobs:

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

- name: Enable Relay
- name: Wait for Cilium to be ready
run: |
cilium hubble enable ${{ steps.vars.outputs.hubble_enable_defaults }}
cilium status --wait
kubectl get pods -n kube-system

- name: Port forward Relay
run: |
Expand Down