Skip to content

Commit

Permalink
Update for coredns, metrics-server, whereabout, multus and canal (#377)
Browse files Browse the repository at this point in the history
* update canal

Signed-off-by: Johnatas <[email protected]>

* update coredns

Signed-off-by: Johnatas <[email protected]>

* update metrics-server

Signed-off-by: Johnatas <[email protected]>

* update whereabouts

Signed-off-by: Johnatas <[email protected]>

* update multus

Signed-off-by: Johnatas <[email protected]>

* back calico package version

Signed-off-by: Johnatas Santos <[email protected]>

* user defined

Signed-off-by: Johnatas Santos <[email protected]>

---------

Signed-off-by: Johnatas Santos <[email protected]>
Co-authored-by: Johnatas Santos <[email protected]>
  • Loading branch information
Johnatas authored Oct 13, 2023
1 parent b7d6d7a commit e2a421a
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion packages/rke2-canal/charts/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: rke2-canal
description: Install Canal Network Plugin.
version: v3.26.1-build20230802
version: v3.26.1-build20231009
appVersion: v3.26.1
home: https://www.projectcalico.org/
keywords:
Expand Down
10 changes: 5 additions & 5 deletions packages/rke2-canal/charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ flannel:
# kube-flannel image
image:
repository: rancher/hardened-flannel
tag: v0.22.1-build20230802
tag: v0.22.1-build20231009
# The interface used by canal for host <-> host communication.
# If left blank, then the interface is chosen using the node's
# default route.
Expand Down Expand Up @@ -61,19 +61,19 @@ calico:
# CNI installation image.
cniImage:
repository: rancher/hardened-calico
tag: v3.26.1-build20230802
tag: v3.26.1-build20231009
# Canal node image.
nodeImage:
repository: rancher/hardened-calico
tag: v3.26.1-build20230802
tag: v3.26.1-build20231009
# Flexvol Image.
flexvolImage:
repository: rancher/hardened-calico
tag: v3.26.1-build20230802
tag: v3.26.1-build20231009
# kubecontroller image
kubeControllerImage:
repository: rancher/hardened-calico
tag: v3.26.1-build20230802
tag: v3.26.1-build20231009

# Datastore type for canal. It can be either kuberentes or etcd.
datastoreType: kubernetes
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-canal/package.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
url: local
packageVersion: 01
packageVersion: 02
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
+ repository: rancher/hardened-coredns
# Overrides the image tag whose default is the chart appVersion.
- tag: ""
+ tag: "v1.10.1-build20230607"
+ tag: "v1.10.1-build20231009"
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
Expand Down Expand Up @@ -116,7 +116,7 @@
- repository: registry.k8s.io/cpa/cluster-proportional-autoscaler
- tag: "1.8.5"
+ repository: rancher/hardened-cluster-autoscaler
+ tag: "v1.8.6-build20230609"
+ tag: "v1.8.6-build20231009"
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
Expand Down Expand Up @@ -177,10 +177,10 @@
+ ipvs: false
+ image:
+ repository: rancher/hardened-dns-node-cache
+ tag: "1.22.20-build20230607"
+ tag: "1.22.20-build20231010"
+ initimage:
+ repository: rancher/hardened-dns-node-cache
+ tag: "1.22.20-build20230607"
+ tag: "1.22.20-build20231010"
+ nodeSelector:
+ kubernetes.io/os: linux
+
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-coredns/package.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
url: https://github.com/coredns/helm/releases/download/coredns-1.24.0/coredns-1.24.0.tgz
packageVersion: 06
packageVersion: 07
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- repository: k8s.gcr.io/metrics-server-amd64
- tag: v0.3.6
+ repository: rancher/hardened-k8s-metrics-server
+ tag: v0.6.3-build20230607
+ tag: v0.6.3-build20231009
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-metrics-server/package.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
url: https://charts.helm.sh/stable/packages/metrics-server-2.11.1.tgz
packageVersion: 10
packageVersion: 11
releaseCandidateVersion: 00
2 changes: 1 addition & 1 deletion packages/rke2-multus/package.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
url: local
workingDir: charts
packageVersion: 00
packageVersion: 01
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
- tag: "latest-amd64"
+ tag: v0.6.2-build20230717
+ tag: v0.6.2-build20231009

updateStrategy: RollingUpdate
imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-whereabouts/package.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
url: https://github.com/k8snetworkplumbingwg/helm-charts.git
commit: ca7c0a7549952660eab8f4b12e7ec7be133b381c
subdirectory: whereabouts
packageVersion: 02
packageVersion: 03
# whereabouts is only used as a dependency of multus
doNotRelease: true

0 comments on commit e2a421a

Please sign in to comment.