Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc6d95aa

Browse files
authored
operator: Do not include non-static labels in pod selectors (grafana#5907)
1 parent2dc4571 commitc6d95aa

File tree

10 files changed

+98
-333
lines changed

10 files changed

+98
-333
lines changed

‎operator/.bingo/Variables.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
4141
@echo"(re)installing$(GOBIN)/golangci-lint-v1.38.0"
4242
@cd$(BINGO_DIR)&&$(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.38.0"github.com/golangci/golangci-lint/cmd/golangci-lint"
4343

44-
KUSTOMIZE :=$(GOBIN)/kustomize-v3.8.7
44+
KUSTOMIZE :=$(GOBIN)/kustomize-v4.2.0
4545
$(KUSTOMIZE):$(BINGO_DIR)/kustomize.mod
4646
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
47-
@echo"(re)installing$(GOBIN)/kustomize-v3.8.7"
48-
@cd$(BINGO_DIR)&&$(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v3.8.7"sigs.k8s.io/kustomize/kustomize/v3"
47+
@echo"(re)installing$(GOBIN)/kustomize-v4.2.0"
48+
@cd$(BINGO_DIR)&&$(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v4.2.0"sigs.k8s.io/kustomize/kustomize/v4"
4949

5050
OPERATOR_SDK :=$(GOBIN)/operator-sdk-v1.18.1
5151
$(OPERATOR_SDK):$(BINGO_DIR)/operator-sdk.mod

‎operator/.bingo/kustomize.mod‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

33
go 1.17
44

5-
require sigs.k8s.io/kustomize/kustomize/v3 v3.8.7
5+
exclude sigs.k8s.io/kustomize/api v0.2.0
6+
7+
exclude sigs.k8s.io/kustomize/cmd/config v0.2.0
8+
9+
require sigs.k8s.io/kustomize/kustomize/v4 v4.2.0

‎operator/.bingo/kustomize.sum‎

Lines changed: 61 additions & 295 deletions
Large diffs are not rendered by default.

‎operator/.bingo/variables.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ GOFUMPT="${GOBIN}/gofumpt-v0.1.1"
1616

1717
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.38.0"
1818

19-
KUSTOMIZE="${GOBIN}/kustomize-v3.8.7"
19+
KUSTOMIZE="${GOBIN}/kustomize-v4.2.0"
2020

2121
OPERATOR_SDK="${GOBIN}/operator-sdk-v1.18.1"
2222

‎operator/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
##Main
22

3+
-[5907](https://github.com/grafana/loki/pull/5907)**xperimental**: Do not include non-static labels in pod selectors
34
-[5893](https://github.com/grafana/loki/pull/5893)**periklis**: Align PVC storage size requests for all lokistack t-shirt sizes
45
-[5884](https://github.com/grafana/loki/pull/5884)**periklis**: Update Loki operand to v2.5.0
56
-[5748](https://github.com/grafana/loki/pull/5748)**Red-GV**: Update Prometheus go client to 12.1

‎operator/bundle/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ spec:
1818
protocol:TCP
1919
targetPort:https
2020
selector:
21-
app.kubernetes.io/instance:loki-operator-v0.0.1
2221
app.kubernetes.io/managed-by:operator-lifecycle-manager
2322
app.kubernetes.io/name:loki-operator
2423
app.kubernetes.io/part-of:cluster-logging
25-
app.kubernetes.io/version:0.0.1
2624
name:loki-operator-controller-manager
2725
status:
2826
loadBalancer:{}

‎operator/bundle/manifests/loki-operator.clusterserviceversion.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,23 +586,19 @@ spec:
586586
replicas:1
587587
selector:
588588
matchLabels:
589-
app.kubernetes.io/instance:loki-operator-v0.0.1
590589
app.kubernetes.io/managed-by:operator-lifecycle-manager
591590
app.kubernetes.io/name:loki-operator
592591
app.kubernetes.io/part-of:cluster-logging
593-
app.kubernetes.io/version:0.0.1
594592
name:loki-operator-controller-manager
595593
strategy:{}
596594
template:
597595
metadata:
598596
annotations:
599597
kubectl.kubernetes.io/default-container:manager
600598
labels:
601-
app.kubernetes.io/instance:loki-operator-v0.0.1
602599
app.kubernetes.io/managed-by:operator-lifecycle-manager
603600
app.kubernetes.io/name:loki-operator
604601
app.kubernetes.io/part-of:cluster-logging
605-
app.kubernetes.io/version:0.0.1
606602
name:loki-operator-controller-manager
607603
spec:
608604
containers:

‎operator/config/overlays/development/kustomization.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ resources:
77
# Adds namespace to all resources.
88
namespace:default
99

10-
# Labels to add to all resources and selectors.
11-
#commonLabels:
12-
# someName: someValue
13-
commonLabels:
14-
app.kubernetes.io/name:loki-operator
15-
app.kubernetes.io/instance:loki-operator-v0.0.1
16-
app.kubernetes.io/version:"0.0.1"
17-
app.kubernetes.io/part-of:loki-operator
18-
app.kubernetes.io/managed-by:operator-lifecycle-manager
10+
labels:
11+
-pairs:
12+
app.kubernetes.io/name:loki-operator
13+
app.kubernetes.io/part-of:loki-operator
14+
app.kubernetes.io/managed-by:operator-lifecycle-manager
15+
includeSelectors:true
16+
-pairs:
17+
app.kubernetes.io/instance:loki-operator-v0.0.1
18+
app.kubernetes.io/version:"0.0.1"
1919

2020
patchesStrategicMerge:
2121
-manager_related_image_patch.yaml

‎operator/config/overlays/openshift/kustomization.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ namespace: openshift-logging
2020
# field above.
2121
namePrefix:loki-operator-
2222

23-
# Labels to add to all resources and selectors.
24-
#commonLabels:
25-
# someName: someValue
26-
commonLabels:
27-
app.kubernetes.io/name:loki-operator
28-
app.kubernetes.io/instance:loki-operator-v0.0.1
29-
app.kubernetes.io/version:"0.0.1"
30-
app.kubernetes.io/part-of:cluster-logging
31-
app.kubernetes.io/managed-by:operator-lifecycle-manager
23+
labels:
24+
-pairs:
25+
app.kubernetes.io/name:loki-operator
26+
app.kubernetes.io/part-of:cluster-logging
27+
app.kubernetes.io/managed-by:operator-lifecycle-manager
28+
includeSelectors:true
29+
-pairs:
30+
app.kubernetes.io/instance:loki-operator-v0.0.1
31+
app.kubernetes.io/version:"0.0.1"
3232

3333
patchesStrategicMerge:
3434
# Protect the /metrics endpoint by putting it behind auth.

‎operator/config/overlays/production/kustomization.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ namespace: loki-operator
2020
# field above.
2121
namePrefix:loki-operator-
2222

23-
# Labels to add to all resources and selectors.
24-
#commonLabels:
25-
# someName: someValue
26-
commonLabels:
27-
app.kubernetes.io/name:loki-operator
28-
app.kubernetes.io/instance:loki-operator-v0.0.1
29-
app.kubernetes.io/version:"0.0.1"
30-
app.kubernetes.io/part-of:loki-operator
31-
app.kubernetes.io/managed-by:operator-lifecycle-manager
23+
labels:
24+
-pairs:
25+
app.kubernetes.io/name:loki-operator
26+
app.kubernetes.io/part-of:loki-operator
27+
app.kubernetes.io/managed-by:operator-lifecycle-manager
28+
includeSelectors:true
29+
-pairs:
30+
app.kubernetes.io/instance:loki-operator-v0.0.1
31+
app.kubernetes.io/version:"0.0.1"
3232

3333
patchesStrategicMerge:
3434
# Protect the /metrics endpoint by putting it behind auth.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp