From 6142d3a66f2616478c15abdca72e108d20de5710 Mon Sep 17 00:00:00 2001 From: Curt Bushko Date: Thu, 25 Aug 2022 22:42:08 -0400 Subject: [PATCH] Add CHANGELOG, remove multus, set acceptance to nightly/correct channel Add CHANGELOG, remove multus, set acceptance to nightly/correct channel --- .circleci/config.yml | 49 ++++++++++++---------- CHANGELOG.md | 2 + charts/consul/templates/cni-daemonset.yaml | 1 - charts/consul/test/unit/cni-daemonset.bats | 5 --- charts/consul/values.yaml | 8 ---- 5 files changed, 30 insertions(+), 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a7669066b..613e308ff9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ executors: environment: TEST_RESULTS: /tmp/test-results # path to where test results are saved +slack-channel: &slack-channel CBXF3CGAF control-plane-path: &control-plane-path control-plane cli-path: &cli-path cli acceptance-mod-path: &acceptance-mod-path acceptance @@ -564,7 +565,7 @@ jobs: machine: image: ubuntu-2004:202010-01 resource_class: xlarge - parallelism: 6 + parallelism: 3 steps: - checkout - install-prereqs @@ -607,6 +608,7 @@ jobs: gcloud container clusters delete $cluster --zone us-central1-a --project ${CLOUDSDK_CORE_PROJECT} --quiet done - slack/status: + channel: *slack-channel fail_only: true failure_message: "GKE cleanup failed" @@ -624,6 +626,7 @@ jobs: az group delete -n $group --yes done - slack/status: + channel: *slack-channel fail_only: true failure_message: "AKS cleanup failed" @@ -643,6 +646,7 @@ jobs: make ci.aws-acceptance-test-cleanup - slack/status: + channel: *slack-channel fail_only: true failure_message: "EKS cleanup failed" @@ -713,11 +717,12 @@ jobs: when: always - slack/status: + channel: *slack-channel fail_only: true failure_message: "GKE acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}" acceptance-gke-cni-1-20: - parallelism: 6 + parallelism: 3 environment: - TEST_RESULTS: /tmp/test-results docker: @@ -780,8 +785,7 @@ jobs: when: always - slack/status: - # temporarily sending to #cni-acceptance-tests channel - channel: C03V3K0040G + channel: *slack-channel fail_only: true failure_message: "GKE CNI acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -838,11 +842,12 @@ jobs: when: always - slack/status: + channel: *slack-channel fail_only: true failure_message: "AKS acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}" acceptance-aks-cni-1-21: - parallelism: 6 + parallelism: 3 environment: - TEST_RESULTS: /tmp/test-results docker: @@ -893,8 +898,7 @@ jobs: terraform destroy -auto-approve when: always - slack/status: - # temporarily sending to #cni-acceptance-tests channel - channel: C03V3K0040G + channel: *slack-channel fail_only: true failure_message: "AKS CNI acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -957,11 +961,12 @@ jobs: when: always - slack/status: + channel: *slack-channel fail_only: true failure_message: "EKS acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}" acceptance-eks-cni-1-19: - parallelism: 6 + parallelism: 3 environment: - TEST_RESULTS: /tmp/test-results docker: @@ -1019,8 +1024,7 @@ jobs: when: always - slack/status: - # temporarily sending to #cni-acceptance-tests channel - channel: C03V3K0040G + channel: *slack-channel fail_only: true failure_message: "EKS CNI acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -1074,6 +1078,7 @@ jobs: when: always - slack/status: + channel: *slack-channel fail_only: true failure_message: "OpenShift acceptance tests failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -1108,11 +1113,12 @@ jobs: - store_artifacts: path: /tmp/test-results - slack/status: + channel: *slack-channel fail_only: true failure_message: "Acceptance tests against Kind with Kubernetes v1.23 failed. Check the logs at: ${CIRCLE_BUILD_URL}" acceptance-kind-cni-1-23: - parallelism: 6 + parallelism: 3 environment: - TEST_RESULTS: /tmp/test-results machine: @@ -1142,8 +1148,7 @@ jobs: - store_artifacts: path: /tmp/test-results - slack/status: - # temporarily sending to #cni-acceptance-tests channel - channel: C03V3K0040G + channel: *slack-channel fail_only: true failure_message: "Acceptance tests for CNI against Kind with Kubernetes v1.23 failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -1181,6 +1186,7 @@ jobs: - store_artifacts: path: /tmp/test-results - slack/status: + channel: *slack-channel fail_only: true failure_message: "Acceptance tests against Kind with Kubernetes v1.23 with Consul 1.11 nightly failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -1218,6 +1224,7 @@ jobs: - store_artifacts: path: /tmp/test-results - slack/status: + channel: *slack-channel fail_only: true failure_message: "Acceptance tests against Kind with Kubernetes v1.23 with Consul 1.12 nightly failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -1255,6 +1262,7 @@ jobs: - store_artifacts: path: /tmp/test-results - slack/status: + channel: *slack-channel fail_only: true failure_message: "Acceptance tests against Kind with Kubernetes v1.23 with Consul 1.13 nightly failed. Check the logs at: ${CIRCLE_BUILD_URL}" @@ -1288,13 +1296,13 @@ workflows: requires: - dev-upload-docker nightly-acceptance-tests: - # triggers: - # - schedule: - # cron: "0 0 * * *" - # filters: - # branches: - # only: - # - main + triggers: + - schedule: + cron: "0 0 * * *" + filters: + branches: + only: + - main jobs: - build-distro: OS: "linux" @@ -1324,7 +1332,6 @@ workflows: - dev-upload-docker - acceptance-eks-cni-1-19: requires: - # TODO: Cleanup on merge - cleanup-eks-resources - dev-upload-docker - acceptance-aks-1-21: diff --git a/CHANGELOG.md b/CHANGELOG.md index cbf53a1f7e..8f34db1073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ FEATURES: * MaxInboundConnections in service-defaults CRD * Add support for MaxInboundConnections on the Service Defaults CRD. [[GH-1437](https://github.com/hashicorp/consul-k8s/pull/1437)] +* Consul CNI Plugin + * CNI Plugin for Consul-k8s [[GH-1465](https://github.com/hashicorp/consul-k8s/pull/1456)] IMPROVEMENTS: * CLI: diff --git a/charts/consul/templates/cni-daemonset.yaml b/charts/consul/templates/cni-daemonset.yaml index 1e96db984b..a74693da57 100644 --- a/charts/consul/templates/cni-daemonset.yaml +++ b/charts/consul/templates/cni-daemonset.yaml @@ -60,7 +60,6 @@ spec: command: - consul-k8s-control-plane - install-cni - - -multus={{ .Values.connectInject.cni.multus }} - -log-level={{ default .Values.global.logLevel .Values.connectInject.cni.logLevel }} - -cni-bin-dir={{ .Values.connectInject.cni.cniBinDir }} - -cni-net-dir={{ .Values.connectInject.cni.cniNetDir }} diff --git a/charts/consul/test/unit/cni-daemonset.bats b/charts/consul/test/unit/cni-daemonset.bats index 92a2d9545f..e826642a00 100644 --- a/charts/consul/test/unit/cni-daemonset.bats +++ b/charts/consul/test/unit/cni-daemonset.bats @@ -60,7 +60,6 @@ load _helpers -s templates/cni-daemonset.yaml \ --set 'connectInject.cni.enabled=true' \ --set 'connectInject.enabled=true' \ - --set 'connectInject.cni.multus=foo' \ --set 'connectInject.cni.logLevel=bar' \ --set 'connectInject.cni.cniBinDir=baz' \ --set 'connectInject.cni.cniNetDir=foo' \ @@ -76,10 +75,6 @@ load _helpers yq 'any(contains("install-cni"))' | tee /dev/stderr) [ "${actual}" = "true" ] - local actual=$(echo "$cmd" | - yq 'any(contains("multus=foo"))' | tee /dev/stderr) - [ "${actual}" = "true" ] - local actual=$(echo "$cmd" | yq 'any(contains("log-level=bar"))' | tee /dev/stderr) [ "${actual}" = "true" ] diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index a4f0bd11f7..7f00ef6ef2 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -1938,14 +1938,6 @@ connectInject: # Requires connectInject.enabled to also be true. # @type: boolean enabled: false - - # If multus plugin is enabled or not. If true, the CNI installer will generate a consul CNI configuration - # in a location for the multus program to use. Also, the helm chart will create a custom resource for - # NetworkAttachmentDefintion that multus will consume. The values for cniBinDir and cniNetDir must also be - # changed for multus to work. - # Please refer to your cloud platform for more informaton on using multus. - # @type: boolean - multus: false # Log level for the installer and plugin. Overrides global.logLevel # @type: string