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

ci: bump helm to v3.14.3 #3829

Merged
merged 3 commits into from
Mar 22, 2024
Merged

ci: bump helm to v3.14.3 #3829

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
d62e569
ci: bump helm to v3.14.3
zhangzujian Mar 14, 2024
00370f3
.gitignore: add ovn certs
zhangzujian Mar 14, 2024
a5c47fb
bump deepflow chart to 6.4.013
zhangzujian Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-x86-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,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
8 changes: 3 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -864,7 +864,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 \
Expand All @@ -875,7 +874,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 \
Expand Down
Loading