Skip to content

Commit e2aacc5

Browse files
committed
Upgrade to operator to v1.6.1
1 parent cc09f5a commit e2aacc5

File tree

7 files changed

+30
-5
lines changed

7 files changed

+30
-5
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ bin
2222
*.swp
2323
*.swo
2424
*~
25-
.local
25+
.local
26+
testbin

bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
55
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
66
LABEL operators.operatorframework.io.bundle.package.v1=slack-operator
77
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
8-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.5.0
8+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.6.1
99
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1010
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1111
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/

bundle/manifests/slack-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
}
2323
]
2424
capabilities: Basic Install
25-
operators.operatorframework.io/builder: operator-sdk-v1.5.0
25+
operators.operatorframework.io/builder: operator-sdk-v1.6.1
2626
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
2727
name: slack-operator.v0.0.23
2828
namespace: placeholder

bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ annotations:
44
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: slack-operator
7-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.5.0
7+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.6.1
88
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
99
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1010
operators.operatorframework.io.test.config.v1: tests/scorecard/

config/manifests/bases/slack-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
alm-examples: '[]'
66
capabilities: Basic Install
7-
operators.operatorframework.io/builder: operator-sdk-v1.5.0
7+
operators.operatorframework.io/builder: operator-sdk-v1.6.1
88
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
99
name: slack-operator.vX.Y.Z
1010
namespace: placeholder

config/manifests/kustomization.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,23 @@ resources:
22
- ../default
33
- ../samples
44
- ../scorecard
5+
6+
# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
7+
# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
8+
# These patches remove the unnecessary "cert" volume and its manager container volumeMount.
9+
#patchesJson6902:
10+
#- target:
11+
# group: apps
12+
# version: v1
13+
# kind: Deployment
14+
# name: controller-manager
15+
# namespace: system
16+
# patch: |-
17+
# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
18+
# # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.
19+
# - op: remove
20+
# path: /spec/template/spec/containers/1/volumeMounts/0
21+
# # Remove the "cert" volume, since OLM will create and mount a set of certs.
22+
# # Update the indices in this path if adding or removing volumes in the manager's Deployment.
23+
# - op: remove
24+
# path: /spec/template/spec/volumes/0

config/prometheus/monitor.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ spec:
1111
endpoints:
1212
- path: /metrics
1313
port: https
14+
scheme: https
15+
bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
16+
tlsConfig:
17+
insecureSkipVerify: true
1418
selector:
1519
matchLabels:
1620
control-plane: controller-manager

0 commit comments

Comments
 (0)