Skip to content

Commit

Permalink
WIP: test with master
Browse files Browse the repository at this point in the history
Signed-off-by: Federico Paolinelli <[email protected]>
  • Loading branch information
fedepaol committed Jul 11, 2024
1 parent d80357c commit 302ee96
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion charts/frr-k8s/values.yaml
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: 10.0.1
tag: master
pullPolicy:
metricsBindAddress: 127.0.0.1
metricsPort: 7573
Expand Down
8 changes: 4 additions & 4 deletions config/all-in-one/frr-k8s-prometheus.yaml
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
name: cp-frr-files
securityContext:
runAsGroup: 101
Expand Down
8 changes: 4 additions & 4 deletions config/all-in-one/frr-k8s.yaml
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
name: cp-frr-files
securityContext:
runAsGroup: 101
Expand Down
8 changes: 4 additions & 4 deletions config/frr-k8s/frr-k8s.yaml
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
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:10.0.1
image: quay.io/frrouting/frr:master
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func handleFlags() {
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(&executor.Kubectl, "kubectl", "kubectl", "the path for the kubectl binary")
flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:10.0.1", "the image to use for the external frr containers")
flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:master", "the image to use for the external frr containers")

flag.Parse()

Expand Down

0 comments on commit 302ee96

Please sign in to comment.