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

Jump to bottom

Bump FRR to 9.1.0 #163

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Bump FRR to 9.1.0 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 charts/frr-k8s/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Kubernetes: `>= 1.19.0-0`
| frrk8s.disableCertRotation | bool | `false` | |
| frrk8s.frr.image.pullPolicy | string | `nil` | |
| frrk8s.frr.image.repository | string | `"quay.io/frrouting/frr"` | |
| frrk8s.frr.image.tag | string | `"9.0.2"` | |
| frrk8s.frr.image.tag | string | `"9.1.0"` | |
| frrk8s.frr.metricsBindAddress | string | `"127.0.0.1"` | |
| frrk8s.frr.metricsPort | int | `7573` | |
| frrk8s.frr.resources | object | `{}` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/frr-k8s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ frrk8s:
frr:
image:
repository: quay.io/frrouting/frr
tag: 9.0.2
tag: 9.1.0
pullPolicy:
metricsBindAddress: 127.0.0.1
metricsPort: 7573
Expand Down
8 changes: 4 additions & 4 deletions config/all-in-one/frr-k8s-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@ spec:
env:
- name: TINI_SUBREAPER
value: "true"
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down Expand Up @@ -1180,7 +1180,7 @@ spec:
- --metrics-bind-address=127.0.0.1
command:
- /etc/frr_metrics/frr-metrics
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
name: frr-metrics
ports:
- containerPort: 7573
Expand All @@ -1194,7 +1194,7 @@ spec:
name: metrics
- command:
- /etc/frr_reloader/frr-reloader.sh
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
name: reloader
volumeMounts:
- mountPath: /var/run/frr
Expand All @@ -1209,7 +1209,7 @@ spec:
- /bin/sh
- -c
- cp -rLf /tmp/frr/* /etc/frr/
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
name: cp-frr-files
securityContext:
runAsGroup: 101
Expand Down
8 changes: 4 additions & 4 deletions config/all-in-one/frr-k8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ spec:
env:
- name: TINI_SUBREAPER
value: "true"
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down Expand Up @@ -1149,7 +1149,7 @@ spec:
- --metrics-bind-address=127.0.0.1
command:
- /etc/frr_metrics/frr-metrics
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
name: frr-metrics
ports:
- containerPort: 7573
Expand All @@ -1163,7 +1163,7 @@ spec:
name: metrics
- command:
- /etc/frr_reloader/frr-reloader.sh
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
name: reloader
volumeMounts:
- mountPath: /var/run/frr
Expand All @@ -1178,7 +1178,7 @@ spec:
- /bin/sh
- -c
- cp -rLf /tmp/frr/* /etc/frr/
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
name: cp-frr-files
securityContext:
runAsGroup: 101
Expand Down
8 changes: 4 additions & 4 deletions config/frr-k8s/frr-k8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ spec:
securityContext:
capabilities:
add: ["NET_ADMIN", "NET_RAW", "SYS_ADMIN", "NET_BIND_SERVICE"]
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
env:
- name: TINI_SUBREAPER
value: "true"
Expand Down Expand Up @@ -136,7 +136,7 @@ spec:
failureThreshold: 30
periodSeconds: 5
- name: frr-metrics
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
command: ["/etc/frr_metrics/frr-metrics"]
args:
- --metrics-port=7573
Expand All @@ -152,7 +152,7 @@ spec:
- name: metrics
mountPath: /etc/frr_metrics
- name: reloader
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
command: ["/etc/frr_reloader/frr-reloader.sh"]
volumeMounts:
- name: frr-sockets
Expand Down Expand Up @@ -186,7 +186,7 @@ spec:
securityContext:
runAsUser: 100
runAsGroup: 101
image: quay.io/frrouting/frr:9.0.2
image: quay.io/frrouting/frr:9.1.0
command: ["/bin/sh", "-c", "cp -rLf /tmp/frr/* /etc/frr/"]
volumeMounts:
- name: frr-startup
Expand Down
2 changes: 1 addition & 1 deletion e2etests/e2etest_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ func handleFlags() {
flag.StringVar(&reportPath, "report-path", "/tmp/report", "the path to be used to dump test failure information")
flag.StringVar(&prometheusNamespace, "prometheus-namespace", "monitoring", "the namespace prometheus is running in (if running)")
flag.StringVar(&externalContainers, "external-containers", "", "a comma separated list of external containers names to use for the test. (valid parameters are: ibgp-single-hop / ibgp-multi-hop / ebgp-single-hop / ebgp-multi-hop)")
flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:9.0.2", "the image to use for the external frr containers")
flag.StringVar(&executor.Kubectl, "kubectl", "kubectl", "the path for the kubectl binary")
flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:9.1.0", "the image to use for the external frr containers")

flag.Parse()

Expand Down
2 changes: 1 addition & 1 deletion hack/demo/demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cp frr/daemons $FRR_CONFIG
chmod a+rw $FRR_CONFIG/*

docker rm -f frr
docker run -d --privileged --network kind --rm --ulimit core=-1 --name frr --volume "$FRR_CONFIG":/etc/frr quay.io/frrouting/frr:9.0.2
docker run -d --privileged --network kind --rm --ulimit core=-1 --name frr --volume "$FRR_CONFIG":/etc/frr quay.io/frrouting/frr:9.1.0

FRR_IP=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" frr)

Expand Down
2 changes: 1 addition & 1 deletion internal/frr/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var (
)

const (
frrImageTag = "9.0.2"
frrImageTag = "9.1.0"
)

func TestMain(m *testing.M) {
Expand Down
Loading