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.

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

deps: bump mockserver to v5.15.0 #3825

Merged
merged 3 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ integration-test-local:

.PHONY: integration-test-metrics #these tests should run on a real cluster!
integration-test-metrics:
kubectl apply -f ./lifecycle-operator/config/crd/bases
kubectl apply -f ./metrics-operator/config/crd/bases
chainsaw test --test-dir ./test/chainsaw/testmetrics/
chainsaw test --test-dir ./test/chainsaw/testanalysis/

.PHONY: integration-test-metrics-local #these tests should run on a real cluster!
integration-test-metrics-local:
kubectl apply -f ./lifecycle-operator/config/crd/bases
kubectl apply -f ./metrics-operator/config/crd/bases
chainsaw test --test-dir ./test/chainsaw/testmetrics/ --config ./.chainsaw-local.yaml
chainsaw test --test-dir ./test/chainsaw/testanalysis/ --config ./.chainsaw-local.yaml

Expand Down
9 changes: 8 additions & 1 deletion examples/support/analysis/config/mock-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,15 @@ spec:
value: INFO
- name: SERVER_PORT
value: "1080"
image: mockserver/mockserver:mockserver-5.13.0
image: mockserver/mockserver:mockserver-5.15.0
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
livenessProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ spec:
value: INFO
- name: SERVER_PORT
value: "1080"
image: mockserver/mockserver:mockserver-5.13.0
image: mockserver/mockserver:mockserver-5.15.0
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 128Mi
memory: 512Mi
requests:
cpu: 10m
memory: 64Mi
cpu: 100m
memory: 256Mi
odubajDT marked this conversation as resolved.
Show resolved Hide resolved
livenessProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ spec:
value: INFO
- name: SERVER_PORT
value: "1080"
image: mockserver/mockserver:mockserver-5.13.0
image: mockserver/mockserver:mockserver-5.15.0
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 128Mi
memory: 512Mi
requests:
cpu: 10m
memory: 64Mi
cpu: 100m
memory: 256Mi
livenessProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ spec:
value: INFO
- name: SERVER_PORT
value: "1080"
image: mockserver/mockserver:mockserver-5.13.0
image: mockserver/mockserver:mockserver-5.15.0
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 128Mi
memory: 512Mi
requests:
cpu: 10m
memory: 64Mi
cpu: 100m
memory: 256Mi
livenessProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ spec:
value: INFO
- name: SERVER_PORT
value: "1080"
image: mockserver/mockserver:mockserver-5.13.0
image: mockserver/mockserver:mockserver-5.15.0
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 128Mi
memory: 512Mi
requests:
cpu: 10m
memory: 64Mi
cpu: 100m
memory: 256Mi
livenessProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down
8 changes: 4 additions & 4 deletions test/chainsaw/testmetrics/metrics-hpa/mock-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ spec:
value: INFO
- name: SERVER_PORT
value: "1080"
image: mockserver/mockserver:mockserver-5.13.0
image: mockserver/mockserver:mockserver-5.15.0
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 128Mi
memory: 512Mi
requests:
cpu: 10m
memory: 64Mi
cpu: 100m
memory: 256Mi
livenessProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down
8 changes: 4 additions & 4 deletions test/chainsaw/testmetrics/metrics-keda/mock-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ spec:
value: INFO
- name: SERVER_PORT
value: "1080"
image: mockserver/mockserver:mockserver-5.13.0
image: mockserver/mockserver:mockserver-5.15.0
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 128Mi
memory: 512Mi
requests:
cpu: 10m
memory: 64Mi
cpu: 100m
memory: 256Mi
livenessProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down
Loading