Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare 4.8.0 #853

Merged
merged 1 commit into from Dec 1, 2022
Merged

Prepare 4.8.0 #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
@@ -1,5 +1,5 @@
# Current Operator version
VERSION ?= 4.7.1
VERSION ?= 4.8.0

# IMAGE_TAG_BASE defines the namespace and part of the image name for remote images.
# running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
Expand Down
10 changes: 5 additions & 5 deletions bundle/manifests/grafana-operator.clusterserviceversion.yaml
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@ metadata:
capabilities: Basic Install
categories: Monitoring
certified: "False"
containerImage: quay.io/grafana-operator/grafana-operator:v4.7.1
createdAt: "2022-10-19T10:00:12Z"
containerImage: quay.io/grafana-operator/grafana-operator:v4.8.0
createdAt: "2022-12-01T10:00:12Z"
description: A Kubernetes Operator based on the Operator SDK for creating and
managing Grafana instances
operators.operatorframework.io/builder: operator-sdk-v1.13.1
Expand All @@ -19,7 +19,7 @@ metadata:
operatorframework.io/arch.arm64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: grafana-operator.v4.7.1
name: grafana-operator.v4.8.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -295,7 +295,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: quay.io/grafana-operator/grafana-operator:v4.7.1
image: quay.io/grafana-operator/grafana-operator:v4.8.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -379,4 +379,4 @@ spec:
provider:
name: Red Hat
replaces: grafana-operator.v4.7.1
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I apparently miss wrote this the last time.
4.8.0 replaces 4.7.1.

I guess I manually fixed that in upstream OLM.

version: 4.7.1
version: 4.8.0
137 changes: 137 additions & 0 deletions bundle/manifests/integreatly.org_grafanas.yaml
View file
Open in desktop
Expand Up @@ -5199,6 +5199,143 @@ spec:
type: string
type: object
type: array
topologySpreadConstraints:
items:
description: TopologySpreadConstraint specifies how to spread
matching pods among the given topology.
properties:
labelSelector:
description: LabelSelector is used to find matching pods.
Pods that match this label selector are counted to determine
the number of pods in their corresponding topology domain.
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
maxSkew:
description: 'MaxSkew describes the degree to which pods
may be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
it is the maximum permitted difference between the number
of matching pods in the target topology and the global
minimum. The global minimum is the minimum number of matching
pods in an eligible domain or zero if the number of eligible
domains is less than MinDomains. For example, in a 3-zone
cluster, MaxSkew is set to 1, and pods with the same labelSelector
spread as 2/2/1: In this case, the global minimum is 1.
| zone1 | zone2 | zone3 | | P P | P P | P | -
if MaxSkew is 1, incoming pod can only be scheduled to
zone3 to become 2/2/2; scheduling it onto zone1(zone2)
would make the ActualSkew(3-1) on zone1(zone2) violate
MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled
onto any zone. When `whenUnsatisfiable=ScheduleAnyway`,
it is used to give higher precedence to topologies that
satisfy it. It''s a required field. Default value is 1
and 0 is not allowed.'
format: int32
type: integer
minDomains:
description: "MinDomains indicates a minimum number of eligible
domains. When the number of eligible domains with matching
topology keys is less than minDomains, Pod Topology Spread
treats \"global minimum\" as 0, and then the calculation
of Skew is performed. And when the number of eligible
domains with matching topology keys equals or greater
than minDomains, this value has no effect on scheduling.
As a result, when the number of eligible domains is less
than minDomains, scheduler won't schedule more than maxSkew
Pods to those domains. If value is nil, the constraint
behaves as if MinDomains is equal to 1. Valid values are
integers greater than 0. When value is not nil, WhenUnsatisfiable
must be DoNotSchedule. \n For example, in a 3-zone cluster,
MaxSkew is set to 2, MinDomains is set to 5 and pods with
the same labelSelector spread as 2/2/2: | zone1 | zone2
| zone3 | | P P | P P | P P | The number of domains
is less than 5(MinDomains), so \"global minimum\" is treated
as 0. In this situation, new pod with the same labelSelector
cannot be scheduled, because computed skew will be 3(3
- 0) if new Pod is scheduled to any of the three zones,
it will violate MaxSkew. \n This is an alpha field and
requires enabling MinDomainsInPodTopologySpread feature
gate."
format: int32
type: integer
topologyKey:
description: TopologyKey is the key of node labels. Nodes
that have a label with this key and identical values are
considered to be in the same topology. We consider each
<key, value> as a "bucket", and try to put balanced number
of pods into each bucket. We define a domain as a particular
instance of a topology. Also, we define an eligible domain
as a domain whose nodes match the node selector. e.g.
If TopologyKey is "kubernetes.io/hostname", each Node
is a domain of that topology. And, if TopologyKey is "topology.kubernetes.io/zone",
each zone is a domain of that topology. It's a required
field.
type: string
whenUnsatisfiable:
description: 'WhenUnsatisfiable indicates how to deal with
a pod if it doesn''t satisfy the spread constraint. -
DoNotSchedule (default) tells the scheduler not to schedule
it. - ScheduleAnyway tells the scheduler to schedule the
pod in any location, but giving higher precedence to
topologies that would help reduce the skew. A constraint
is considered "Unsatisfiable" for an incoming pod if and
only if every possible node assignment for that pod would
violate "MaxSkew" on some topology. For example, in a
3-zone cluster, MaxSkew is set to 1, and pods with the
same labelSelector spread as 3/1/1: | zone1 | zone2 |
zone3 | | P P P | P | P | If WhenUnsatisfiable
is set to DoNotSchedule, incoming pod can only be scheduled
to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1)
on zone2(zone3) satisfies MaxSkew(1). In other words,
the cluster can still be imbalanced, but scheduler won''t
make it *more* imbalanced. It''s a required field.'
type: string
required:
- maxSkew
- topologyKey
- whenUnsatisfiable
type: object
type: array
type: object
ingress:
description: GrafanaIngress provides a means to configure the ingress
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/grafana-operator/grafana-operator
newTag: v4.7.1
newTag: v4.8.0

# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics
Expand Down
4 changes: 2 additions & 2 deletions config/manifests/bases/grafana-operator.clusterserviceversion.yaml
View file
Open in desktop
Expand Up @@ -87,8 +87,8 @@ metadata:
capabilities: Basic Install
categories: Monitoring
certified: "False"
containerImage: quay.io/grafana-operator/grafana-operator:v4.7.1
createdAt: "2022-10-19T10:00:12Z"
containerImage: quay.io/grafana-operator/grafana-operator:v4.8.0
createdAt: "2022-12-01T10:00:12Z"
description: A Kubernetes Operator based on the Operator SDK for creating and
managing Grafana instances
repository: https://github.com/grafana-operator/grafana-operator
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/latest/deployment.yaml
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/grafana-operator/grafana-operator:v4.7.1
image: quay.io/grafana-operator/grafana-operator:v4.8.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down