Skip to content

Commit 3d1219d

Browse files
authored
Merge pull request #347 from rabbitmq/registry-references-338
Update registry references to new name
2 parents 2930aac + da9ee52 commit 3d1219d

6 files changed

+17
-91
lines changed

config/default/base/kustomization.yaml

+7-24
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,21 @@
55
# This product is licensed to you under the Mozilla Public license, Version 2.0 (the "License"). You may not use this product except in compliance with the Mozilla Public License.
66
#
77
# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
8+
apiVersion: kustomize.config.k8s.io/v1beta1
9+
kind: Kustomization
810

911
namespace: rabbitmq-system
1012
namePrefix: rabbitmq-cluster-
1113
resources:
12-
# - ../../rbac
1314
- ../../manager
14-
# [WEBHOOK] Uncomment all the sections with [WEBHOOK] prefix to enable webhook.
15-
#- ../webhook
1615
# [CERTMANAGER] Uncomment next line to enable cert-manager
1716
#- ../certmanager
1817

19-
patches:
20-
- manager_image_patch.yaml
2118
# This patch stop manager from emitting any metrics
2219
# For more context, refer to story #167092237
20+
patchesStrategicMerge:
2321
- manager_disable_metrics_patch.yaml
24-
# Protect the /metrics endpoint by putting it behind auth.
25-
# Only one of manager_auth_proxy_patch.yaml and
26-
# manager_prometheus_metrics_patch.yaml should be enabled.
27-
# For more context on why we stop using manager_auth_proxy_patch
28-
# refer to story #167092237
29-
#- manager_auth_proxy_patch.yaml
30-
# If you want your controller-manager to expose the /metrics
31-
# endpoint w/o any authn/z, uncomment the following line and
32-
# comment manager_auth_proxy_patch.yaml.
33-
# Only one of manager_auth_proxy_patch.yaml and
34-
# manager_prometheus_metrics_patch.yaml should be enabled.
35-
#- manager_prometheus_metrics_patch.yaml
36-
37-
# [WEBHOOK] Uncomment all the sections with [WEBHOOK] prefix to enable webhook.
38-
#- manager_webhook_patch.yaml
39-
40-
# [CAINJECTION] Uncomment next line to enable the CA injection in the admission webhooks. [CERTMANAGER] needs to be
41-
# enabled to use ca injection
42-
#- webhookcainjection_patch.yaml
22+
images:
23+
- name: rabbitmqoperator/cluster-operator-dev
24+
newName: rabbitmqoperator/cluster-operator
25+
newTag: latest

config/default/base/manager_image_patch.yaml

-20
This file was deleted.

config/manager/kustomization.yaml

+5-7
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
#
77
# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
88
#
9+
apiVersion: kustomize.config.k8s.io/v1beta1
10+
kind: Kustomization
911

1012
resources:
1113
- manager.yaml
1214

13-
patchesStrategicMerge:
14-
- security_context_patch.yaml
15-
- service_account_patch.yaml
16-
apiVersion: kustomize.config.k8s.io/v1beta1
17-
kind: Kustomization
1815
namespace: rabbitmq-system
16+
namePrefix: rabbitmq-cluster-
17+
1918
images:
2019
- name: controller
21-
newName: rabbitmqoperator/rabbitmq-cluster-kubernetes-operator-dev
20+
newName: rabbitmqoperator/cluster-operator-dev
2221
newTag: latest
23-
namePrefix: rabbitmq-cluster-

config/manager/manager.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ spec:
2929
app.kubernetes.io/component: rabbitmq-cluster-operator
3030
app.kubernetes.io/part-of: rabbitmq
3131
spec:
32+
serviceAccountName: rabbitmq-cluster-operator
33+
securityContext:
34+
runAsUser: 1000
35+
runAsGroup: 1000
36+
fsGroup: 1000
3237
containers:
3338
- command:
3439
- /manager

config/manager/security_context_patch.yaml

-22
This file was deleted.

config/manager/service_account_patch.yaml

-18
This file was deleted.

0 commit comments

Comments
 (0)