upgrade crds version from v1beta1 to v1 (#54)

* upgrade crds version from v1beta1 to v1 Signed-off-by: clyang82 <[email protected]> * Declare the status Signed-off-by: clyang82 <[email protected]> * Add undeclared properties since preserveUnknownFields is true in v1 Signed-off-by: clyang82 <[email protected]>
observatorium · Apr 7, 2021 · 08f589b · 08f589b
1 parent 00cb7a9
commit 08f589b
Show file tree

Hide file tree

Showing 7 changed files with 1,611 additions and 2,126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /kind
 /kubectl
 /tmp/
+vendor
diff --git a/api/v1alpha1/observatorium_types.go b/api/v1alpha1/observatorium_types.go
@@ -18,6 +18,8 @@ package v1alpha1
 import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/brancz/locutus/feedback"
 )
 
 // ObservatoriumSpec defines the desired state of Observatorium
@@ -220,6 +222,9 @@ type TenantOIDC struct {
 	IssuerURL     string `json:"issuerURL"`
 	RedirectURL   string `json:"redirectURL,omitempty"`
 	UsernameClaim string `json:"usernameClaim,omitempty"`
+	CAKey         string `json:"caKey,omitempty"`
+	ConfigMapName string `json:"configMapName,omitempty"`
+	IssuerCAPath  string `json:"issuerCAPath,omitempty"`
 }
 
 // TenantMTLS represents the mTLS configuration for an Observatorium API tenant.
@@ -379,6 +384,10 @@ type LokiSpec struct {
 type ObservatoriumStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
+	// Represents the status of Observatorium
+	// +optional
+	Conditions []*feedback.StatusCondition `json:"conditions"`
 }
 
 // Observatorium is the Schema for the observatoria API

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/example/manifests/observatorium.yaml b/example/manifests/observatorium.yaml
@@ -68,14 +68,14 @@ spec:
   - hashring: default
     tenants: []
   loki:
-    image: docker.io/grafana/loki:2.0.0
+    image: docker.io/grafana/loki:2.1.0
     replicas:
       compactor: 1
       distributor: 1
       ingester: 1
       querier: 1
       query_frontend: 1
-    version: 2.0.0
+    version: 2.1.0
     volumeClaimTemplate:
       spec:
         accessModes:

diff --git a/go.mod b/go.mod
@@ -7,5 +7,5 @@ require (
 	k8s.io/api v0.20.5
 	k8s.io/apimachinery v0.20.5
 	sigs.k8s.io/controller-runtime v0.5.0
-	sigs.k8s.io/controller-tools v0.2.8
+	sigs.k8s.io/controller-tools v0.5.0
 )
diff --git a/go.sum b/go.sum
diff --git a/manifests/crds/core.observatorium.io_observatoria.yaml b/manifests/crds/core.observatorium.io_observatoria.yaml