Skip to content
Snippets Groups Projects
Commit 45869ad7 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

CockroachDB database - CLUSTER mode: 

- Updated Cockroach Operator from v2.9.0 to v2.10.0
- Updated CockroachDB from v22.2.0 to v22.2.8
- Updated per-node requested and limit resources
parent 1076b47b
No related branches found
No related tags found
2 merge requests!142Release TeraFlowSDN 2.1,!90Update version of CockroachDB database (CLUSTER mode)
Hide whitespace changes
Inline Side-by-side
manifests/cockroachdb/client-secure-operator.yaml
+ 2
− 2
View file @ 45869ad7
# Copyright 2022 The Cockroach Authors # Copyright 2023 The Cockroach Authors
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -23,7 +23,7 @@ spec: ...@@ -23,7 +23,7 @@ spec:
serviceAccountName: cockroachdb-sa serviceAccountName: cockroachdb-sa
containers: containers:
- name: cockroachdb-client-secure - name: cockroachdb-client-secure
image: cockroachdb/cockroach:v22.2.0 image: cockroachdb/cockroach:v22.2.8
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: client-certs - name: client-certs
......
manifests/cockroachdb/cluster.yaml
+ 7
− 8
View file @ 45869ad7
# Copyright 2022 The Cockroach Authors # Copyright 2023 The Cockroach Authors
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -33,17 +33,16 @@ spec: ...@@ -33,17 +33,16 @@ spec:
resources: resources:
requests: requests:
# This is intentionally low to make it work on local k3d clusters. # This is intentionally low to make it work on local k3d clusters.
cpu: 100m cpu: 4
memory: 1Gi
limits:
cpu: 1
memory: 4Gi memory: 4Gi
limits:
cpu: 8
memory: 8Gi
tlsEnabled: true tlsEnabled: true
# You can set either a version of the db or a specific image name # You can set either a version of the db or a specific image name
# cockroachDBVersion: v22.2.0 # cockroachDBVersion: v22.2.8
image: image:
#name: cockroachdb/cockroach:v22.2.0 name: cockroachdb/cockroach:v22.2.8
name: cockroachdb/cockroach:latest-v22.2
# nodes refers to the number of crdb pods that are created # nodes refers to the number of crdb pods that are created
# via the statefulset # via the statefulset
nodes: 3 nodes: 3
......
manifests/cockroachdb/crds.yaml
+ 251
− 17
View file @ 45869ad7
# Copyright 2022 The Cockroach Authors # Copyright 2023 The Cockroach Authors
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -354,10 +354,71 @@ spec: ...@@ -354,10 +354,71 @@ spec:
The requirements are ANDed. The requirements are ANDed.
type: object type: object
type: object type: object
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
to the union of the namespaces selected by this
field and the ones listed in the namespaces field.
null selector and null or empty namespaces list
means "this pod's namespace". An empty selector
({}) matches all namespaces. This field is alpha-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are
ANDed.
items:
description: A label selector requirement
is a selector that contains values, a key,
and an operator that relates the key and
values.
properties:
key:
description: key is the label key that
the selector applies to.
type: string
operator:
description: operator represents a key's
relationship to a set of values. Valid
operators are In, NotIn, Exists and
DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty.
If the operator is Exists or DoesNotExist,
the values array must be empty. This
array is replaced during a strategic
merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field is "key", the operator is
"In", and the values array contains only "value".
The requirements are ANDed.
type: object
type: object
namespaces: namespaces:
description: namespaces specifies which namespaces description: namespaces specifies a static list
the labelSelector applies to (matches against); of namespace names that the term applies to. The
null or empty list means "this pod's namespace" term is applied to the union of the namespaces
listed in this field and the ones selected by
namespaceSelector. null or empty namespaces list
and null namespaceSelector means "this pod's namespace"
items: items:
type: string type: string
type: array type: array
...@@ -449,10 +510,66 @@ spec: ...@@ -449,10 +510,66 @@ spec:
requirements are ANDed. requirements are ANDed.
type: object type: object
type: object type: object
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied to the
union of the namespaces selected by this field and
the ones listed in the namespaces field. null selector
and null or empty namespaces list means "this pod's
namespace". An empty selector ({}) matches all namespaces.
This field is alpha-level and is only honored when
PodAffinityNamespaceSelector feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are ANDed.
items:
description: A label selector requirement is a
selector that contains values, a key, and an
operator that relates the key and values.
properties:
key:
description: key is the label key that the
selector applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are
In, NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty. If the
operator is Exists or DoesNotExist, the
values array must be empty. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field is "key", the operator is "In",
and the values array contains only "value". The
requirements are ANDed.
type: object
type: object
namespaces: namespaces:
description: namespaces specifies which namespaces the description: namespaces specifies a static list of namespace
labelSelector applies to (matches against); null or names that the term applies to. The term is applied
empty list means "this pod's namespace" to the union of the namespaces listed in this field
and the ones selected by namespaceSelector. null or
empty namespaces list and null namespaceSelector means
"this pod's namespace"
items: items:
type: string type: string
type: array type: array
...@@ -546,10 +663,71 @@ spec: ...@@ -546,10 +663,71 @@ spec:
The requirements are ANDed. The requirements are ANDed.
type: object type: object
type: object type: object
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
to the union of the namespaces selected by this
field and the ones listed in the namespaces field.
null selector and null or empty namespaces list
means "this pod's namespace". An empty selector
({}) matches all namespaces. This field is alpha-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are
ANDed.
items:
description: A label selector requirement
is a selector that contains values, a key,
and an operator that relates the key and
values.
properties:
key:
description: key is the label key that
the selector applies to.
type: string
operator:
description: operator represents a key's
relationship to a set of values. Valid
operators are In, NotIn, Exists and
DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty.
If the operator is Exists or DoesNotExist,
the values array must be empty. This
array is replaced during a strategic
merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field is "key", the operator is
"In", and the values array contains only "value".
The requirements are ANDed.
type: object
type: object
namespaces: namespaces:
description: namespaces specifies which namespaces description: namespaces specifies a static list
the labelSelector applies to (matches against); of namespace names that the term applies to. The
null or empty list means "this pod's namespace" term is applied to the union of the namespaces
listed in this field and the ones selected by
namespaceSelector. null or empty namespaces list
and null namespaceSelector means "this pod's namespace"
items: items:
type: string type: string
type: array type: array
...@@ -641,10 +819,66 @@ spec: ...@@ -641,10 +819,66 @@ spec:
requirements are ANDed. requirements are ANDed.
type: object type: object
type: object type: object
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied to the
union of the namespaces selected by this field and
the ones listed in the namespaces field. null selector
and null or empty namespaces list means "this pod's
namespace". An empty selector ({}) matches all namespaces.
This field is alpha-level and is only honored when
PodAffinityNamespaceSelector feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are ANDed.
items:
description: A label selector requirement is a
selector that contains values, a key, and an
operator that relates the key and values.
properties:
key:
description: key is the label key that the
selector applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are
In, NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty. If the
operator is Exists or DoesNotExist, the
values array must be empty. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field is "key", the operator is "In",
and the values array contains only "value". The
requirements are ANDed.
type: object
type: object
namespaces: namespaces:
description: namespaces specifies which namespaces the description: namespaces specifies a static list of namespace
labelSelector applies to (matches against); null or names that the term applies to. The term is applied
empty list means "this pod's namespace" to the union of the namespaces listed in this field
and the ones selected by namespaceSelector. null or
empty namespaces list and null namespaceSelector means
"this pod's namespace"
items: items:
type: string type: string
type: array type: array
...@@ -767,7 +1001,7 @@ spec: ...@@ -767,7 +1001,7 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount description: 'Limits describes the maximum amount
of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
requests: requests:
additionalProperties: additionalProperties:
...@@ -780,7 +1014,7 @@ spec: ...@@ -780,7 +1014,7 @@ spec:
of compute resources required. If Requests is omitted of compute resources required. If Requests is omitted
for a container, it defaults to Limits if that is for a container, it defaults to Limits if that is
explicitly specified, otherwise to an implementation-defined explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
selector: selector:
...@@ -1138,7 +1372,7 @@ spec: ...@@ -1138,7 +1372,7 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute resources description: 'Limits describes the maximum amount of compute resources
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
requests: requests:
additionalProperties: additionalProperties:
...@@ -1150,7 +1384,7 @@ spec: ...@@ -1150,7 +1384,7 @@ spec:
description: 'Requests describes the minimum amount of compute description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container, resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
sqlPort: sqlPort:
......
manifests/cockroachdb/operator.yaml
+ 28
− 2
View file @ 45869ad7
# Copyright 2022 The Cockroach Authors # Copyright 2023 The Cockroach Authors
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -538,8 +538,34 @@ spec: ...@@ -538,8 +538,34 @@ spec:
value: cockroachdb/cockroach:v22.1.11 value: cockroachdb/cockroach:v22.1.11
- name: RELATED_IMAGE_COCKROACH_v22_1_12 - name: RELATED_IMAGE_COCKROACH_v22_1_12
value: cockroachdb/cockroach:v22.1.12 value: cockroachdb/cockroach:v22.1.12
- name: RELATED_IMAGE_COCKROACH_v22_1_13
value: cockroachdb/cockroach:v22.1.13
- name: RELATED_IMAGE_COCKROACH_v22_1_14
value: cockroachdb/cockroach:v22.1.14
- name: RELATED_IMAGE_COCKROACH_v22_1_15
value: cockroachdb/cockroach:v22.1.15
- name: RELATED_IMAGE_COCKROACH_v22_1_16
value: cockroachdb/cockroach:v22.1.16
- name: RELATED_IMAGE_COCKROACH_v22_1_18
value: cockroachdb/cockroach:v22.1.18
- name: RELATED_IMAGE_COCKROACH_v22_2_0 - name: RELATED_IMAGE_COCKROACH_v22_2_0
value: cockroachdb/cockroach:v22.2.0 value: cockroachdb/cockroach:v22.2.0
- name: RELATED_IMAGE_COCKROACH_v22_2_1
value: cockroachdb/cockroach:v22.2.1
- name: RELATED_IMAGE_COCKROACH_v22_2_2
value: cockroachdb/cockroach:v22.2.2
- name: RELATED_IMAGE_COCKROACH_v22_2_3
value: cockroachdb/cockroach:v22.2.3
- name: RELATED_IMAGE_COCKROACH_v22_2_4
value: cockroachdb/cockroach:v22.2.4
- name: RELATED_IMAGE_COCKROACH_v22_2_5
value: cockroachdb/cockroach:v22.2.5
- name: RELATED_IMAGE_COCKROACH_v22_2_6
value: cockroachdb/cockroach:v22.2.6
- name: RELATED_IMAGE_COCKROACH_v22_2_7
value: cockroachdb/cockroach:v22.2.7
- name: RELATED_IMAGE_COCKROACH_v22_2_8
value: cockroachdb/cockroach:v22.2.8
- name: OPERATOR_NAME - name: OPERATOR_NAME
value: cockroachdb value: cockroachdb
- name: WATCH_NAMESPACE - name: WATCH_NAMESPACE
...@@ -552,7 +578,7 @@ spec: ...@@ -552,7 +578,7 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
image: cockroachdb/cockroach-operator:v2.9.0 image: cockroachdb/cockroach-operator:v2.10.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: cockroach-operator name: cockroach-operator
resources: resources:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment