Skip to content

Commit

Permalink
start migration doc
Browse files Browse the repository at this point in the history
  • Loading branch information
pb82 committed Aug 17, 2021
1 parent bf225bd commit 00cffe9
Show file tree
Hide file tree
Showing 37 changed files with 4,109 additions and 371 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Expand Up @@ -82,8 +82,4 @@ tags
operator-sdk-*
tmp
manager

# OLM
bundle
config/manifests
vendor
6 changes: 3 additions & 3 deletions Makefile
@@ -1,7 +1,7 @@
# Current Operator version
VERSION ?= latest
VERSION ?= 4.0.0
# Default bundle image tag
BUNDLE_IMG ?= controller-bundle:$(VERSION)
BUNDLE_IMG ?= quay.io/grafana-operator/controller-bundle:v$(VERSION)
# Options for 'bundle-build'
ifneq ($(origin CHANNELS), undefined)
BUNDLE_CHANNELS := --channels=$(CHANNELS)
Expand All @@ -12,7 +12,7 @@ endif
BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)

# Image URL to use all building/pushing image targets8
IMG ?= quay.io/integreatly/grafana-operator:$(VERSION)
IMG ?= quay.io/grafana-operator/grafana-operator:v$(VERSION)
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"

Expand Down
7 changes: 6 additions & 1 deletion api/integreatly/v1alpha1/grafanadashboard_types.go
Expand Up @@ -58,6 +58,10 @@ type GrafanaDashboardRef struct {
FolderName string `json:"folderName"`
}

type GrafanaDashboardStatus struct {
// Empty
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
Expand All @@ -66,7 +70,8 @@ type GrafanaDashboard struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec GrafanaDashboardSpec `json:"spec,omitempty"`
Spec GrafanaDashboardSpec `json:"spec,omitempty"`
Status GrafanaDashboardStatus `json:"status,omitempty"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
16 changes: 16 additions & 0 deletions api/integreatly/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions bundle.Dockerfile
Expand Up @@ -12,3 +12,4 @@ LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
COPY bundle/manifests /manifests/
COPY bundle/metadata /metadata/
COPY bundle/tests/scorecard /tests/scorecard/

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions bundle/manifests/external-credentials_v1_secret.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions bundle/manifests/grafana-k8s-proxy_v1_secret.yaml

This file was deleted.

@@ -0,0 +1,16 @@
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
control-plane: controller-manager
name: grafana-operator-controller-manager-metrics-service
spec:
ports:
- name: https
port: 8443
targetPort: https
selector:
control-plane: controller-manager
status:
loadBalancer: {}
17 changes: 17 additions & 0 deletions bundle/manifests/grafana-operator-manager-config_v1_configmap.yaml
@@ -0,0 +1,17 @@
apiVersion: v1
data:
controller_manager_config.yaml: |
apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
kind: ControllerManagerConfig
health:
healthProbeBindAddress: :8081
metrics:
bindAddress: 127.0.0.1:8080
webhook:
port: 9443
leaderElection:
leaderElect: true
resourceName: 2c0156f0.integreatly.org
kind: ConfigMap
metadata:
name: grafana-operator-manager-config
@@ -0,0 +1,10 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: grafana-operator-metrics-reader
rules:
- nonResourceURLs:
- /metrics
verbs:
- get

0 comments on commit 00cffe9

Please sign in to comment.