diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index aba2613de..57d81309f 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -67,7 +67,7 @@ jobs: - name: Build and load (current arch) env: - KO_DOCKER_REPO: ko.local/grafana-operator/grafana-operator + KO_DOCKER_REPO: ko.local/grafana/grafana-operator run: | ko build --sbom=none --bare kind load docker-image "$KO_DOCKER_REPO" diff --git a/Makefile b/Makefile index c254a0930..d8fa991b7 100644 --- a/Makefile +++ b/Makefile @@ -28,8 +28,8 @@ GRAFANA_VERSION := $(shell grep 'GrafanaVersion' controllers/config/operator_con # Image URL to use all building/pushing image targets REGISTRY ?= ghcr.io -REPO ?= grafana-operator -IMG ?= $(REGISTRY)/$(REPO)/grafana-operator:v$(VERSION) +ORG ?= grafana +IMG ?= $(REGISTRY)/$(ORG)/grafana-operator:v$(VERSION) # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.25.0 @@ -95,7 +95,7 @@ endif manifests: yq controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." crd:maxDescLen=0,generateEmbeddedObjectMeta=false output:crd:artifacts:config=config/crd/bases $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." crd:maxDescLen=0,generateEmbeddedObjectMeta=false output:crd:artifacts:config=deploy/helm/grafana-operator/crds - yq -i '(select(.kind == "Deployment") | .spec.template.spec.containers[0].env[] |= select(.name == "RELATED_IMAGE_GRAFANA").value = "$(GRAFANA_IMAGE):$(GRAFANA_VERSION)"), (select(.kind == "Namespace"))' config/manager/manager.yaml + yq -i '(select(.kind == "Deployment") | .spec.template.spec.containers[0].env[] | select (.name == "RELATED_IMAGE_GRAFANA")).value="$(GRAFANA_IMAGE):$(GRAFANA_VERSION)"' config/manager/manager.yaml .PHONY: kustomize-crd kustomize-crd: kustomize manifests @@ -217,6 +217,7 @@ endif # To re-generate a bundle for other specific channels without changing the standard setup, you can: # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable) # - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable") +CHANNELS=v5 ifneq ($(origin CHANNELS), undefined) BUNDLE_CHANNELS := --channels=$(CHANNELS) endif @@ -226,6 +227,7 @@ endif # To re-generate a bundle for any other default channel without changing the default setup, you can: # - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable) # - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable") +DEFAULT_CHANNEL="v5" ifneq ($(origin DEFAULT_CHANNEL), undefined) BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) endif @@ -300,7 +302,7 @@ else KO=$(shell which ko) endif -export KO_DOCKER_REPO ?= ko.local/grafana-operator/grafana-operator +export KO_DOCKER_REPO ?= ko.local/grafana/grafana-operator export KIND_CLUSTER_NAME ?= kind-grafana export KUBECONFIG ?= ${HOME}/.kube/kind-grafana-operator @@ -332,7 +334,7 @@ start-kind: helm/docs: helm-docs $(HELM_DOCS) -BUNDLE_IMG ?= $(REGISTRY)/$(REPO)/grafana-operator-bundle:v$(VERSION) +BUNDLE_IMG ?= $(REGISTRY)/$(ORG)/grafana-operator-bundle:v$(VERSION) .PHONY: bundle-build bundle-build: ## Build the bundle image. diff --git a/PREPARE_RELEASE.md b/PREPARE_RELEASE.md index c498ae14f..f6ed583a4 100644 --- a/PREPARE_RELEASE.md +++ b/PREPARE_RELEASE.md @@ -34,7 +34,7 @@ There is a lot of information on what is needed to manage OLM [compatible operat - `createdAt`: Make sure that createdAt matches when the image was published. If not you will have to change it manually when creating PR:s to OLM. ``` # This is how the time syntax should look. - $ docker inspect ghcr.io/grafana-operator/grafana-operator:v5.0.0 |jq '.[0].Created' + $ docker inspect ghcr.io/grafana/grafana-operator:v5.0.0 |jq '.[0].Created' "2023-11-22T10:34:12.173861869Z" # 2023-11-22T10:34:12Z is enough ``` diff --git a/PROJECT b/PROJECT index b7ab1d04c..02a361eba 100644 --- a/PROJECT +++ b/PROJECT @@ -3,7 +3,6 @@ layout: - go.kubebuilder.io/v3 plugins: manifests.sdk.operatorframework.io/v2: {} - scorecard.sdk.operatorframework.io/v2: {} projectName: grafana-operator repo: github.com/grafana/grafana-operator resources: diff --git a/bundle.Dockerfile b/bundle.Dockerfile index d8251f59d..74f6e2eab 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,16 +5,12 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=grafana-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha +LABEL operators.operatorframework.io.bundle.channels.v1=v5 +LABEL operators.operatorframework.io.bundle.channel.default.v1=v5 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 -# Labels for testing. -LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 -LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ - # Copy files to locations specified by labels. COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ -COPY bundle/tests/scorecard /tests/scorecard/ diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index dbacbcf0a..3dc2d1221 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -94,12 +94,13 @@ metadata: ] capabilities: Basic Install categories: Monitoring - createdAt: "2023-11-06T20:49:26Z" + containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 + createdAt: "2023-12-11T12:16:24Z" operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/grafana-operator - support: Community - name: grafana-operator.v5.4.2 + support: Grafana Labs + name: grafana-operator.v5.6.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -322,13 +323,9 @@ spec: - --metrics-bind-address=0.0.0.0:9090 - --leader-elect env: - - name: RELATED_IMAGE_GRAFANA - value: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8 - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - image: ghcr.io/grafana-operator/grafana-operator@sha256:bd4faa4e8b721fbbc8e7bde096347e4b123e85a01ab437c021664120ac3c00c6 + - name: "" + - name: "" + image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 imagePullPolicy: Always livenessProbe: httpGet: @@ -410,15 +407,15 @@ spec: - Observability links: - name: Grafana Operator - url: https://grafana-operator.github.io/grafana-operator - maturity: alpha + url: https://grafana.github.io/grafana-operator + maturity: stable minKubeVersion: 1.23.0 provider: name: Community relatedImages: - - image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8 - name: grafana - - image: ghcr.io/grafana-operator/grafana-operator@sha256:bd4faa4e8b721fbbc8e7bde096347e4b123e85a01ab437c021664120ac3c00c6 + - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 name: manager - replaces: grafana-operator.v5.4.1 - version: 5.4.2 + - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 + name: grafana-operator-97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752-annotation + replaces: grafana-operator.v5.5.2 + version: 5.6.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 403d1480f..87ac26496 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,11 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: grafana-operator - operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.bundle.channels.v1: v5 + operators.operatorframework.io.bundle.channel.default.v1: v5 operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 - - # Annotations for testing. - operators.operatorframework.io.test.mediatype.v1: scorecard+v1 - operators.operatorframework.io.test.config.v1: tests/scorecard/ diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml deleted file mode 100644 index 14c9f7c39..000000000 --- a/bundle/tests/scorecard/config.yaml +++ /dev/null @@ -1,70 +0,0 @@ -apiVersion: scorecard.operatorframework.io/v1alpha3 -kind: Configuration -metadata: - name: config -stages: -- parallel: true - tests: - - entrypoint: - - scorecard-test - - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.15.0 - labels: - suite: basic - test: basic-check-spec-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.15.0 - labels: - suite: olm - test: olm-bundle-validation-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.15.0 - labels: - suite: olm - test: olm-crds-have-validation-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.15.0 - labels: - suite: olm - test: olm-crds-have-resources-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.15.0 - labels: - suite: olm - test: olm-spec-descriptors-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.15.0 - labels: - suite: olm - test: olm-status-descriptors-test - storage: - spec: - mountPath: {} -storage: - spec: - mountPath: {} diff --git a/config/kuttl-overlay/kustomization.yaml b/config/kuttl-overlay/kustomization.yaml index c646aa6dc..ccfe4473d 100644 --- a/config/kuttl-overlay/kustomization.yaml +++ b/config/kuttl-overlay/kustomization.yaml @@ -10,6 +10,6 @@ patches: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - - name: ghcr.io/grafana-operator/grafana-operator - newName: ko.local/grafana-operator/grafana-operator + - name: ghcr.io/grafana/grafana-operator + newName: ko.local/grafana/grafana-operator newTag: latest diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 64e2deff7..55eeca4f1 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -14,5 +14,5 @@ configMapGenerator: images: - name: controller - newName: ghcr.io/grafana-operator/grafana-operator - newTag: v5.4.2 + newName: ghcr.io/grafana/grafana-operator + newTag: v5.6.0 diff --git a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml index 5875737b6..37149b38a 100644 --- a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml @@ -5,10 +5,10 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Monitoring - containerImage: ghcr.io/grafana-operator/grafana-operator:v5.5.0 - createdAt: "2023-09-12T08:09:00.92Z" + containerImage: ghcr.io/grafana/grafana-operator:v5.6.0 + createdAt: "2023-12-11T09:21:22Z" repository: https://github.com/grafana/grafana-operator - support: Community + support: Grafana Labs name: grafana-operator.v0.0.0 namespace: placeholder spec: @@ -59,10 +59,10 @@ spec: - Observability links: - name: Grafana Operator - url: https://grafana-operator.github.io/grafana-operator - maturity: alpha + url: https://grafana.github.io/grafana-operator + maturity: stable minKubeVersion: 1.23.0 provider: name: Community - replaces: grafana-operator.v5.4.1 + replaces: grafana-operator.v5.5.2 version: 0.0.0 diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index 43011b243..fe94d4633 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -4,7 +4,6 @@ resources: - bases/grafana-operator.clusterserviceversion.yaml - ../default - ../samples - - ../scorecard # [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix. # Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager. # These patches remove the unnecessary "cert" volume and its manager container volumeMount. diff --git a/config/scorecard/kustomization.yaml b/config/scorecard/kustomization.yaml index 7b144f995..dba9959cc 100644 --- a/config/scorecard/kustomization.yaml +++ b/config/scorecard/kustomization.yaml @@ -1,12 +1,6 @@ resources: - bases/config.yaml patches: -- path: patches/basic.config.yaml - target: - group: scorecard.operatorframework.io - kind: Configuration - name: config - version: v1alpha3 - path: patches/olm.config.yaml target: group: scorecard.operatorframework.io diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index f543761f9..697f1b1ab 100644 --- a/deploy/helm/grafana-operator/README.md +++ b/deploy/helm/grafana-operator/README.md @@ -14,7 +14,7 @@ linkTitle: "Helm installation" This is a OCI helm chart, helm started support OCI in version 3.8.0. ```shell -helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.6.0 +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.6.0 ``` Sadly helm OCI charts currently don't support searching for available versions of a helm [oci registry](https://github.com/helm/helm/issues/11000). @@ -40,7 +40,7 @@ It's easier to just manage this configuration outside of the operator. | env | list | `[]` | Additional environment variables | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | The image pull policy to use in grafana operator container | -| image.repository | string | `"ghcr.io/grafana-operator/grafana-operator"` | grafana operator image repository | +| image.repository | string | `"ghcr.io/grafana/grafana-operator"` | grafana operator image repository | | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | | imagePullSecrets | list | `[]` | image pull secrets | | leaderElect | bool | `false` | If you want to run multiple replicas of the grafana-operator, this is not recommended. | diff --git a/deploy/helm/grafana-operator/README.md.gotmpl b/deploy/helm/grafana-operator/README.md.gotmpl index 695413bc5..f6193defd 100644 --- a/deploy/helm/grafana-operator/README.md.gotmpl +++ b/deploy/helm/grafana-operator/README.md.gotmpl @@ -14,7 +14,7 @@ linkTitle: "Helm installation" This is a OCI helm chart, helm started support OCI in version 3.8.0. ```shell -helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version {{ template "chart.appVersion" . }} +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version {{ template "chart.appVersion" . }} ``` Sadly helm OCI charts currently don't support searching for available versions of a helm [oci registry](https://github.com/helm/helm/issues/11000). diff --git a/deploy/helm/grafana-operator/values.yaml b/deploy/helm/grafana-operator/values.yaml index 0a3df1e58..c51ec700b 100644 --- a/deploy/helm/grafana-operator/values.yaml +++ b/deploy/helm/grafana-operator/values.yaml @@ -20,7 +20,7 @@ env: [] image: # -- grafana operator image repository - repository: ghcr.io/grafana-operator/grafana-operator + repository: ghcr.io/grafana/grafana-operator # -- The image pull policy to use in grafana operator container pullPolicy: IfNotPresent # -- Overrides the image tag whose default is the chart appVersion. diff --git a/deploy/kustomize/base/deployment.yaml b/deploy/kustomize/base/deployment.yaml index 5192e96a8..5971573c9 100644 --- a/deploy/kustomize/base/deployment.yaml +++ b/deploy/kustomize/base/deployment.yaml @@ -22,7 +22,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=0.0.0.0:9090 - --leader-elect - image: ghcr.io/grafana-operator/grafana-operator:v5.4.2 + image: ghcr.io/grafana/grafana-operator:v5.4.2 imagePullPolicy: Always ports: - containerPort: 9090 diff --git a/docs/blog/flux-gitops/grafana-operator.yaml b/docs/blog/flux-gitops/grafana-operator.yaml index 54252229d..aee1c400f 100644 --- a/docs/blog/flux-gitops/grafana-operator.yaml +++ b/docs/blog/flux-gitops/grafana-operator.yaml @@ -5,7 +5,7 @@ metadata: namespace: flux-system spec: interval: 10m - url: oci://ghcr.io/grafana-operator/kustomize/grafana-operator + url: oci://ghcr.io/grafana/kustomize/grafana-operator ref: tag: v5.0.0-rc3 --- @@ -18,7 +18,7 @@ spec: interval: 10m targetNamespace: grafana images: - - name: ghcr.io/grafana-operator/grafana-operator + - name: ghcr.io/grafana/grafana-operator newTag: v5.0.0-rc3 prune: true sourceRef: diff --git a/docs/blog/kustomize-installation.md b/docs/blog/kustomize-installation.md index d10fd6c94..88279a647 100644 --- a/docs/blog/kustomize-installation.md +++ b/docs/blog/kustomize-installation.md @@ -131,7 +131,7 @@ If you want to install the grafana-operator without using GitOps, you can also d For example, you can run the following Flux command to download the artifact and unpack it. Then you can run a normal kubectl apply command. ```shell -flux pull artifact oci://ghcr.io/grafana-operator/kustomize/grafana-operator:{{}} -output ./grafana-opreator +flux pull artifact oci://ghcr.io/grafana/kustomize/grafana-operator:{{}} -output ./grafana-opreator ``` But of course we recommend that you manage your grafana-operator installation through your GitOps solution, no matter if it's Flux or some other solution. diff --git a/docs/blog/v5-getting-started.md b/docs/blog/v5-getting-started.md index e348ffdaa..1555a414b 100644 --- a/docs/blog/v5-getting-started.md +++ b/docs/blog/v5-getting-started.md @@ -76,7 +76,7 @@ We are hosting our Helm chart in an OCI repo so it's a bit different from what y notice the `oci://` part of the URL. ```shell -helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version {{}} -n grafana-operator +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version {{}} -n grafana-operator ``` ## Use operator diff --git a/docs/docs/installation/kustomize.md b/docs/docs/installation/kustomize.md index 6a879aeb3..3f4da3cd1 100644 --- a/docs/docs/installation/kustomize.md +++ b/docs/docs/installation/kustomize.md @@ -16,7 +16,7 @@ After you have downloaded Flux you can use `flux pull artifact` to download the ```shell mkdir grafana-operator -flux pull artifact oci://ghcr.io/grafana-operator/kustomize/grafana-operator:{{}} --output ./grafana-operator/ +flux pull artifact oci://ghcr.io/grafana/kustomize/grafana-operator:{{}} --output ./grafana-operator/ ``` This will provide you the manifest files unpacked and ready to use. diff --git a/go.mod b/go.mod index 470929b5f..7890f59de 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/grafana/grafana-operator/v5 -go 1.20 +go 1.21 + +toolchain go1.21.3 require ( github.com/bitly/go-simplejson v0.5.1 diff --git a/go.sum b/go.sum index 72860db43..190110617 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,6 @@ github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitly/go-simplejson v0.5.1 h1:xgwPbetQScXt1gh9BmoJ6j9JMr3TElvuIyjR8pgdoow= @@ -15,6 +16,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -35,7 +37,9 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b h1:/vQ+oYKu+JoyaMPDsv5FzwuL2wwWBgBbtj/YLCi4LuA= +github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b/go.mod h1:Xo4aNUOrJnVruqWQJBtW6+bTBDTniY8yZum5rF3b5jw= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= @@ -65,6 +69,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grafana/grafana-api-golang-client v0.26.0 h1:Eu2YsfUezYngy8ifvmLybgluIcn/2IS9u1xkzuYstEM= @@ -84,6 +89,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -107,6 +113,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= @@ -127,7 +134,9 @@ github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -147,6 +156,7 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= @@ -214,6 +224,7 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=