From 1302e358a82645f48ece993144a58209c6fb9b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Fri, 22 Mar 2024 10:21:37 +0800 Subject: [PATCH] ci: bump helm to v3.14.3 (#3829) * ci: bump helm to v3.14.3 * .gitignore: add ovn certs * bump deepflow chart to 6.4.013 Signed-off-by: zhangzujian --- .github/workflows/build-x86-image.yaml | 2 +- .github/workflows/scheduled-e2e.yaml | 2 +- .gitignore | 4 ++++ Makefile | 8 +++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 9b3e2e5d3ee..28214d0f823 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -24,7 +24,7 @@ env: GO_VERSION: '' KIND_VERSION: v0.22.0 GOSEC_VERSION: '2.19.0' - HELM_VERSION: v3.14.1 + HELM_VERSION: v3.14.3 SUBMARINER_VERSION: '0.16.3' jobs: diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index adf7bd69615..b5601c54b5a 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -12,7 +12,7 @@ concurrency: env: GO_VERSION: '' KIND_VERSION: v0.22.0 - HELM_VERSION: v3.14.1 + HELM_VERSION: v3.14.3 SUBMARINER_VERSION: '0.16.3' jobs: diff --git a/.gitignore b/.gitignore index efb900993b1..0e7049dd22e 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,7 @@ kube-ovn-cni-sa.yaml kube-ovn-sa.yaml ovn-ovs-sa.yaml ovs-ovn-ds.yaml +cacert.pem +ovn-req.pem +ovn-cert.pem +ovn-privkey.pem diff --git a/Makefile b/Makefile index 9bb40245add..11cb72fec0f 100644 --- a/Makefile +++ b/Makefile @@ -45,10 +45,10 @@ KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/ KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml KUBEVIRT_TEST_YAML = https://kubevirt.io/labs/manifests/vm.yaml -CILIUM_VERSION = 1.15.1 +CILIUM_VERSION = 1.15.2 CILIUM_IMAGE_REPO = quay.io/cilium -CERT_MANAGER_VERSION = v1.14.2 +CERT_MANAGER_VERSION = v1.14.4 CERT_MANAGER_CONTROLLER = quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION) CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION) CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION) @@ -63,7 +63,7 @@ SUBMARINER_ROUTE_AGENT = quay.io/submariner/submariner-route-agent:$(SUBMARINER_ SUBMARINER_NETTEST = quay.io/submariner/nettest:$(SUBMARINER_VERSION) DEEPFLOW_VERSION = v6.4 -DEEPFLOW_CHART_VERSION = 6.4.012 +DEEPFLOW_CHART_VERSION = 6.4.013 DEEPFLOW_CHART_REPO = https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/stable DEEPFLOW_IMAGE_REPO = registry.cn-beijing.aliyuncs.com/deepflow-ce DEEPFLOW_SERVER_NODE_PORT = 30417 @@ -831,7 +831,6 @@ kind-install-deepflow: kind-install helm repo add deepflow $(DEEPFLOW_CHART_REPO) helm repo update deepflow $(eval CLICKHOUSE_PERSISTENCE = $(shell helm show values --version $(DEEPFLOW_CHART_VERSION) --jsonpath '{.clickhouse.storageConfig.persistence}' deepflow/deepflow | sed 's/0Gi/Gi/g')) - $(eval GRAFANA_EXTRA_INIT_CONTAINERS = $(shell helm show values --version $(DEEPFLOW_CHART_VERSION) --jsonpath '{.grafana.extraInitContainers}' deepflow/deepflow | sed 's/:latest/:$(DEEPFLOW_VERSION)/g')) helm install deepflow deepflow/deepflow --wait \ --version $(DEEPFLOW_CHART_VERSION) \ --namespace deepflow \ @@ -842,7 +841,6 @@ kind-install-deepflow: kind-install --set grafana.image.registry=$(DEEPFLOW_IMAGE_REPO) \ --set grafana.image.pullPolicy=IfNotPresent \ --set grafana.service.nodePort=$(DEEPFLOW_GRAFANA_NODE_PORT) \ - --set-json 'grafana.extraInitContainers=$(GRAFANA_EXTRA_INIT_CONTAINERS)' \ --set mysql.storageConfig.persistence.size=5Gi \ --set mysql.image.pullPolicy=IfNotPresent \ --set clickhouse.image.pullPolicy=IfNotPresent \