operator: make replicationFactor optional (#5701)

4 years ago · dec695f112
parent 2ebbecfcbd
commit dec695f112
9 changed files with 3 additions and 9 deletions
--- a/operator/CHANGELOG.md
+++ b/operator/CHANGELOG.md
@ -1,5 +1,6 @@
 ## Main

+- [5701](https://github.com/grafana/loki/pull/5701) **sasagarw**: Make ReplicationFactor optional in LokiStack API
 - [5695](https://github.com/grafana/loki/pull/5695) **xperimental**: Update Go to 1.17
 - [5615](https://github.com/grafana/loki/pull/5615) **sasagarw**: Document how to connect to LokiStack gateway component
 - [5655](https://github.com/grafana/loki/pull/5655) **xperimental**: Update Loki operand to 2.4.2
--- a/operator/api/v1beta1/lokistack_types.go
+++ b/operator/api/v1beta1/lokistack_types.go
@ -510,8 +510,8 @@ type LokiStackSpec struct {

 	// ReplicationFactor defines the policy for log stream replication.
 	//
-	// +required
-	// +kubebuilder:validation:Required
+	// +optional
+	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:Minimum:=1
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Replication Factor"
 	ReplicationFactor int32 `json:"replicationFactor"`
--- a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml
+++ b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml
@ -11,7 +11,6 @@ metadata:
            "name": "lokistack-sample"
          },
          "spec": {
-            "replicationFactor": 2,
            "size": "1x.small",
            "storage": {
              "secret": {
--- a/operator/bundle/manifests/loki.grafana.com_lokistacks.yaml
+++ b/operator/bundle/manifests/loki.grafana.com_lokistacks.yaml
@ -807,7 +807,6 @@ spec:
                - mode
                type: object
            required:
-            - replicationFactor
            - size
            - storage
            - storageClassName
--- a/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml
+++ b/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml
@ -585,7 +585,6 @@ spec:
                - mode
                type: object
            required:
-            - replicationFactor
            - size
            - storage
            - storageClassName
--- a/operator/config/samples/loki_v1beta1_lokistack.yaml
+++ b/operator/config/samples/loki_v1beta1_lokistack.yaml
@ -4,7 +4,6 @@ metadata:
  name: lokistack-sample
 spec:
  size: 1x.small
-  replicationFactor: 2
  storage:
    secret:
      name: test
--- a/operator/hack/lokistack_dev.yaml
+++ b/operator/hack/lokistack_dev.yaml
@ -4,7 +4,6 @@ metadata:
  name: lokistack-dev
 spec:
  size: 1x.extra-small
-  replicationFactor: 1
  storage:
    secret:
      name: test
--- a/operator/hack/lokistack_gateway_dev.yaml
+++ b/operator/hack/lokistack_gateway_dev.yaml
@ -4,7 +4,6 @@ metadata:
  name: lokistack-dev
 spec:
  size: 1x.extra-small
-  replicationFactor: 1
  storage:
    secret:
      name: test
--- a/operator/hack/lokistack_gateway_ocp.yaml
+++ b/operator/hack/lokistack_gateway_ocp.yaml
@ -4,7 +4,6 @@ metadata:
  name: lokistack-dev
 spec:
  size: 1x.extra-small
-  replicationFactor: 1
  storage:
    secret:
      name: test