diff --git a/.github/cilium-cli-test-job-chart/.helmignore b/.github/cilium-cli-test-job-chart/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/.github/cilium-cli-test-job-chart/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/.github/cilium-cli-test-job-chart/Chart.yaml b/.github/cilium-cli-test-job-chart/Chart.yaml deleted file mode 100644 index bbd8789677..0000000000 --- a/.github/cilium-cli-test-job-chart/Chart.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v2 -name: cilium-cli-test-job-chart -description: Test job chart for Cilium CLI - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1.16.0 diff --git a/.github/cilium-cli-test-job-chart/templates/job.yaml b/.github/cilium-cli-test-job-chart/templates/job.yaml deleted file mode 100644 index 8d5df3df0c..0000000000 --- a/.github/cilium-cli-test-job-chart/templates/job.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ .Values.job_name }} - namespace: kube-system -spec: - backoffLimit: 0 - template: - spec: - containers: - - args: - - "bash" - - "/root/test/in-cluster-test-script.sh" - image: quay.io/cilium/cilium-cli-ci:{{ .Values.tag }} - imagePullPolicy: Always - name: test - volumeMounts: - - name: kubeconfig - mountPath: /root/.kube - - name: test-script - mountPath: /root/test - env: - - name: CILIUM_VERSION - value: {{ .Values.cilium_version }} - - name: KUBECONFIG - value: /root/.kube/config - - name: CLUSTER_NAME - value: {{ .Values.cluster_name }} - - name: CLUSTER_CIDR - value: {{ .Values.cluster_cidr }} - - name: VM_NAME - value: {{ .Values.vm_name }} - - name: CLUSTER_NAME_1 - value: {{ .Values.cluster_name_1 }} - - name: CLUSTER_NAME_2 - value: {{ .Values.cluster_name_2 }} - - name: AZURE_SUBSCRIPTION_ID - value: {{ .Values.azure.subscription_id }} - - name: AZURE_NODE_RESOURCE_GROUP - value: {{ .Values.azure.node_resource_group }} - - name: AZURE_TENANT_ID - value: {{ .Values.azure.tenant_id }} - - name: AZURE_CLIENT_ID - value: {{ .Values.azure.client_id }} - - name: AZURE_CLIENT_SECRET - value: {{ .Values.azure.client_secret }} - dnsPolicy: ClusterFirst - enableServiceLinks: true - priority: 0 - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - hostNetwork: true - tolerations: - - operator: Exists - volumes: - - name: kubeconfig - configMap: - name: cilium-cli-kubeconfig - items: - - key: kubeconfig - path: config - - name: test-script - configMap: - name: {{ .Values.test_script_cm }} diff --git a/.github/cilium-cli-test-job-chart/values.yaml b/.github/cilium-cli-test-job-chart/values.yaml deleted file mode 100644 index 541b35f73f..0000000000 --- a/.github/cilium-cli-test-job-chart/values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Default values for test-chart. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -tag: latest -cilium_version: "" -cluster_name: test -cluster_cidr: 10.4.0.0/14 -test_script_cm: cilium-cli-test-script -job_name: cilium-cli -vm_name: "" -cluster_name_1: "" -cluster_cidr_1: "" -cluster_name_2: "" -cluster_cidr_2: "" -azure: - subscription_id: "" - node_resource_group: "" - tenant_id: "" - client_id: "" - client_secret: "" diff --git a/.github/in-cluster-test-scripts/aks-byocni-install.sh b/.github/in-cluster-test-scripts/aks-byocni-install.sh deleted file mode 100644 index def7d64574..0000000000 --- a/.github/in-cluster-test-scripts/aks-byocni-install.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -x -set -e - -# Install Cilium -cilium install \ - --version "${CILIUM_VERSION}" \ - --datapath-mode=aks-byocni \ - --wait=false \ - --set loadBalancer.l7.backend=envoy \ - --set tls.secretsBackend=k8s \ - --set bpf.monitorAggregation=none \ - --set ipam.operator.clusterPoolIPv4PodCIDRList=192.168.0.0/16 # To avoid clashing with the default Service CIDR of AKS (10.0.0.0/16) diff --git a/.github/in-cluster-test-scripts/aks.sh b/.github/in-cluster-test-scripts/aks.sh deleted file mode 100644 index 1e8dd0db5f..0000000000 --- a/.github/in-cluster-test-scripts/aks.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -x -set -e - -# Enable Relay -cilium hubble enable - -# Wait for cilium and hubble relay to be ready -# NB: necessary to work against occassional flakes due to https://github.com/cilium/cilium-cli/issues/918 -cilium status --wait - -# Port forward Relay -cilium hubble port-forward& -sleep 10s -[[ $(pgrep -f "cilium.*hubble.*port-forward|kubectl.*port-forward.*hubble-relay" | wc -l) == 2 ]] - -# Run connectivity test -cilium connectivity test --debug --all-flows --collect-sysdump-on-failure --external-target bing.com. - -# Run performance test -cilium connectivity perf --duration 1s - -# Retrieve Cilium status -cilium status diff --git a/.github/workflows/eks-tunnel.yaml b/.github/workflows/eks-tunnel.yaml index 1d29f4d656..d5b715a905 100644 --- a/.github/workflows/eks-tunnel.yaml +++ b/.github/workflows/eks-tunnel.yaml @@ -131,14 +131,6 @@ jobs: skip-build: 'true' image-tag: ${{ steps.vars.outputs.sha }} - - name: Create cilium-cli test job - run: | - helm install .github/cilium-cli-test-job-chart \ - --generate-name \ - --set tag=${{ steps.vars.outputs.sha }} \ - --set cilium_version=${{ env.cilium_version }} \ - --set cluster_name=${{ env.clusterName }} - - name: Install Cilium and run tests timeout-minutes: 30 run: | diff --git a/CODEOWNERS b/CODEOWNERS index 99c98e3aa3..94738af3fe 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -17,10 +17,8 @@ * @cilium/cli /CODEOWNERS @cilium/contributing /.github/ @cilium/contributing -/.github/cilium-cli-test-job-chart/ @cilium/github-sec @cilium/ci-structure /.github/gcp-vm-startup.sh @cilium/ci-structure /.github/get-kubeconfig.sh @cilium/github-sec @cilium/ci-structure -/.github/in-cluster-test-scripts/ @cilium/ci-structure /.github/kind-config*.yaml @cilium/ci-structure /.github/tools/ @cilium/ci-structure /.github/workflows/ @cilium/github-sec @cilium/ci-structure