Skip to content

Commit

Permalink
charts, test/e2e: synchronize PieProbe CRD
Browse files Browse the repository at this point in the history
In pull request #101, we introduced a new custom resource called
PieProbe. However, the charts/ and test/e2e/ directories were not
synchronized with the auto-generated config/ directory.

This patch fixes the above probelm, by copying the latest PieProbe CRD
from config/ to charts/ and updating the manifests used in the e2e
tests.

Signed-off-by: Ryotaro Banno <ryotaro.banno@gmail.com>
  • Loading branch information
ushitora-anqou committed Feb 29, 2024
1 parent d0b7626 commit 73e9efe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
11 changes: 6 additions & 5 deletions charts/pie/templates/pie.topolvm.io_pieprobes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.13.0
name: pieprobes.pie.topolvm.io
spec:
group: pie.topolvm.io
Expand Down Expand Up @@ -34,10 +34,6 @@ spec:
spec:
description: PieProbeSpec defines the desired state of PieProbe
properties:
containerImage:
type: string
controllerUrl:
type: string
monitoringStorageClass:
type: string
x-kubernetes-validations:
Expand Down Expand Up @@ -133,6 +129,11 @@ spec:
type: integer
probeThreshold:
type: string
required:
- monitoringStorageClass
- nodeSelector
- probePeriod
- probeThreshold
type: object
status:
description: PieProbeStatus defines the observed state of PieProbe
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/testdata/pieProbe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ metadata:
namespace: e2e
spec:
monitoringStorageClass: standard
containerImage: pie:dev
controllerUrl: http://pie.e2e.svc:8082
nodeSelector:
nodeSelectorTerms:
- matchExpressions:
Expand All @@ -25,8 +23,6 @@ metadata:
namespace: e2e
spec:
monitoringStorageClass: dummy
containerImage: pie:dev
controllerUrl: http://pie.e2e.svc:8082
nodeSelector:
nodeSelectorTerms:
- matchExpressions:
Expand Down

0 comments on commit 73e9efe

Please sign in to comment.