Skip to content

Commit

Permalink
regenerate CR definition
Browse files Browse the repository at this point in the history
Signed-off-by: Gabriel Bernal <[email protected]>
  • Loading branch information
jgbernalp committed Mar 12, 2024
1 parent 75f56df commit 468f8d6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
#
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
# perses.dev/perses-operator-bundle:$VERSION and perses.dev/perses-operator-catalog:$VERSION.
IMAGE_TAG_BASE ?= quay.io/gbernal/perses-operator
IMAGE_TAG_BASE ?= persesdev/perses-operator

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
Expand Down
1 change: 0 additions & 1 deletion config/crd/bases/perses.dev_perses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ spec:
folder:
type: string
required:
- extension
- folder
type: object
sql:
Expand Down
8 changes: 4 additions & 4 deletions controllers/dashboards/dasboard_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ func (r *PersesDashboardReconciler) syncPersesDashboard(ctx context.Context, per

_, err = persesClient.Dashboard(dashboard.Namespace).Get(dashboard.Name)

dashboardWithName := &dashboard.Spec.Dashboard
dashboardWithName.Metadata.Name = dashboard.Name
persesDashboard := &dashboard.Spec.Dashboard
persesDashboard.Metadata.Name = dashboard.Name

if err != nil {
if errors.Is(err, perseshttp.RequestNotFoundError) {
_, err = persesClient.Dashboard(dashboard.Namespace).Create(dashboardWithName)
_, err = persesClient.Dashboard(dashboard.Namespace).Create(persesDashboard)

if err != nil {
dlog.WithError(err).Errorf("Failed to create dashboard: %s", dashboard.Name)
Expand All @@ -113,7 +113,7 @@ func (r *PersesDashboardReconciler) syncPersesDashboard(ctx context.Context, per

return subreconciler.RequeueWithError(err)
} else {
_, err = persesClient.Dashboard(dashboard.Namespace).Update(dashboardWithName)
_, err = persesClient.Dashboard(dashboard.Namespace).Update(persesDashboard)

if err != nil {
dlog.WithError(err).Errorf("Failed to update dashboard: %s", dashboard.Name)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.10
github.com/perses/perses v0.43.1-0.20240212140825-8efdfab0f93d
github.com/perses/perses v0.43.1-0.20240219142255-6799f0a7cffc
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
gopkg.in/yaml.v2 v2.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
github.com/perses/common v0.22.0 h1:G5nCKjBbgu0Y/sosRWe5VfgFy9XoECVv2KcfAnKEqsM=
github.com/perses/common v0.22.0/go.mod h1:FjtkQ3IYxithLrgTNbuG3rdusl8XXoE60a2DaX4FEHk=
github.com/perses/perses v0.43.1-0.20240212140825-8efdfab0f93d h1:so+n1SsmsPGF/XqPyZlkVAf87XdAgfIlLQAb+Wbo2Nc=
github.com/perses/perses v0.43.1-0.20240212140825-8efdfab0f93d/go.mod h1:EC6c3vxDuRGdD/5rkEk22Q3dTvJDb7NfUJmwZsDdqIU=
github.com/perses/perses v0.43.1-0.20240219142255-6799f0a7cffc h1:ruT3UEorqS9Pb3EfzBVqdTdeMt0m2xXlf4D1u1HPsrQ=
github.com/perses/perses v0.43.1-0.20240219142255-6799f0a7cffc/go.mod h1:EC6c3vxDuRGdD/5rkEk22Q3dTvJDb7NfUJmwZsDdqIU=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down

0 comments on commit 468f8d6

Please sign in to comment.