Skip to content

Commit

Permalink
Merge branch 'master' into passsing-whole-jsonnet-project-to-dashboard
Browse files Browse the repository at this point in the history 
# Conflicts:
#	api/v1beta1/grafanadashboard_types.go
#	config/crd/bases/grafana.integreatly.org_grafanadashboards.yaml
#	config/grafana.integreatly.org_grafanadashboards.yaml
#	deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml
#	deploy/kustomize/base/crds.yaml
#	docs/docs/api.md
#	go.sum
  • Loading branch information
@olejeglejeg
olejeglejeg committed Aug 25, 2023
2 parents e1661e8 + 76b60c8 commit f0a080c
Show file tree
Hide file tree
Showing 21 changed files with 1,410 additions and 846 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0
- id: changed-files
name: Get changed files
uses: tj-actions/changed-files@a96679dfee2a1e64b1db5a210c0ffaf1f2cb24ce #v37.5.1
uses: tj-actions/changed-files@a0585ff9904b77d046192a7846e59783d6ea287b #v37.6.1
with:
files_ignore: |
**/*.md
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-validation.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Clone the code
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b #v3.2.0
- name: reviewdog
uses: reviewdog/action-setup@8e48baae926e97848f0863ae248f3b08e089c81f # v1.0.5
uses: reviewdog/action-setup@80a06617492b461a66508e2dedf16233f0506804 # v1.0.6
with:
reviewdog_version: latest

Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
go-version-file: "go.mod"

- name: golangci-lint
uses: golangci/golangci-lint-action@v3.6.0
uses: golangci/golangci-lint-action@v3.7.0
with:
version: "v1.51.2"

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v4.5.7
KUSTOMIZE_VERSION ?= v5.1.1
CONTROLLER_TOOLS_VERSION ?= v0.12.0

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
Expand Down Expand Up @@ -335,7 +335,7 @@ ifeq (, $(shell which crdoc))
API_REF_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$API_REF_GEN_TMP_DIR ;\
go mod init tmp ;\
go install fybrik.io/crdoc@v0.6.2 ;\
go install fybrik.io/crdoc@ad5ba1e62f8db46cb5a9282dfedfc3d8f3d45065 ;\
rm -rf $$API_REF_GEN_TMP_DIR ;\
}
API_REF_GEN=$(GOBIN)/crdoc
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/grafana-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,6 @@ spec:
maturity: alpha
minKubeVersion: 1.23.0
provider:
name: Red Hat
name: Community
replaces: grafana-operator.v5.2.0
version: 5.3.0
108 changes: 107 additions & 1 deletion config/crd/bases/grafana.integreatly.org_grafanas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -896,8 +896,33 @@ spec:
format: int32
type: integer
type: object
resizePolicy:
items:
properties:
resourceName:
type: string
restartPolicy:
type: string
required:
- resourceName
- restartPolicy
type: object
type: array
x-kubernetes-list-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand All @@ -915,6 +940,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
restartPolicy:
type: string
securityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -1513,8 +1540,33 @@ spec:
format: int32
type: integer
type: object
resizePolicy:
items:
properties:
resourceName:
type: string
restartPolicy:
type: string
required:
- resourceName
- restartPolicy
type: object
type: array
x-kubernetes-list-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand All @@ -1532,6 +1584,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
restartPolicy:
type: string
securityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -2137,8 +2191,33 @@ spec:
format: int32
type: integer
type: object
resizePolicy:
items:
properties:
resourceName:
type: string
restartPolicy:
type: string
required:
- resourceName
- restartPolicy
type: object
type: array
x-kubernetes-list-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand All @@ -2156,6 +2235,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
restartPolicy:
type: string
securityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -2758,13 +2839,26 @@ spec:
type: string
name:
type: string
namespace:
type: string
required:
- kind
- name
type: object
x-kubernetes-map-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -3475,6 +3569,18 @@ spec:
x-kubernetes-map-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down
Loading

0 comments on commit f0a080c

Please sign in to comment.