From 67330ceeed938f8c6cf8e29541390e53508f4cc4 Mon Sep 17 00:00:00 2001 From: volodymyrZotov Date: Mon, 31 Oct 2022 17:36:14 +0200 Subject: [PATCH 1/3] change default controller name --- config/default/kustomization.yaml | 2 +- config/default/manager_auth_proxy_patch.yaml | 2 +- config/default/manager_config_patch.yaml | 2 +- config/manager/manager.yaml | 11 ++++++----- config/prometheus/monitor.yaml | 6 +++--- config/rbac/auth_proxy_role_binding.yaml | 2 +- config/rbac/auth_proxy_service.yaml | 6 +++--- config/rbac/leader_election_role_binding.yaml | 2 +- config/rbac/role_binding.yaml | 2 +- config/rbac/service_account.yaml | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 27c013b..59f8133 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -3,7 +3,7 @@ # "wordpress" becomes "alices-wordpress". # Note that it should also match with the prefix (text before '-') of the namespace # field above. -namePrefix: onepassword-operator- +# namePrefix: onepassword-connect- # Labels to add to all resources and selectors. #labels: diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index cec149a..e212f7d 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: controller-manager + name: onepassword-connect-operator namespace: system spec: template: diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml index 6c40015..84f2f4a 100644 --- a/config/default/manager_config_patch.yaml +++ b/config/default/manager_config_patch.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: controller-manager + name: onepassword-connect-operator namespace: system spec: template: diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index afb586d..5510987 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -1,21 +1,21 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: controller-manager + name: onepassword-connect-operator namespace: system labels: - control-plane: controller-manager + control-plane: onepassword-connect-operator spec: selector: matchLabels: - control-plane: controller-manager + control-plane: onepassword-connect-operator replicas: 1 template: metadata: annotations: kubectl.kubernetes.io/default-container: manager labels: - control-plane: controller-manager + control-plane: onepassword-connect-operator spec: securityContext: runAsNonRoot: true @@ -32,6 +32,7 @@ spec: args: - --leader-elect image: 1password/onepassword-operator:latest + imagePullPolicy: Never # TODO: remove name: manager env: - name: WATCH_NAMESPACE @@ -79,5 +80,5 @@ spec: requests: cpu: 10m memory: 64Mi - serviceAccountName: controller-manager + serviceAccountName: onepassword-connect-operator terminationGracePeriodSeconds: 10 diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index d19136a..67c9bf0 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -4,8 +4,8 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - control-plane: controller-manager - name: controller-manager-metrics-monitor + control-plane: onepassword-connect-operator + name: onepassword-connect-operator-metrics-monitor namespace: system spec: endpoints: @@ -17,4 +17,4 @@ spec: insecureSkipVerify: true selector: matchLabels: - control-plane: controller-manager + control-plane: onepassword-connect-operator diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml index ec7acc0..fe8b292 100644 --- a/config/rbac/auth_proxy_role_binding.yaml +++ b/config/rbac/auth_proxy_role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: proxy-role subjects: - kind: ServiceAccount - name: controller-manager + name: onepassword-connect-operator namespace: system diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml index 71f1797..c57d52f 100644 --- a/config/rbac/auth_proxy_service.yaml +++ b/config/rbac/auth_proxy_service.yaml @@ -2,8 +2,8 @@ apiVersion: v1 kind: Service metadata: labels: - control-plane: controller-manager - name: controller-manager-metrics-service + control-plane: onepassword-connect-operator + name: onepassword-connect-operator-metrics-service namespace: system spec: ports: @@ -12,4 +12,4 @@ spec: protocol: TCP targetPort: https selector: - control-plane: controller-manager + control-plane: onepassword-connect-operator diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index 1d1321e..0ed9e91 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: leader-election-role subjects: - kind: ServiceAccount - name: controller-manager + name: onepassword-connect-operator namespace: system diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index 2070ede..4b7d611 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: manager-role subjects: - kind: ServiceAccount - name: controller-manager + name: onepassword-connect-operator namespace: system diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml index 7cd6025..b969a33 100644 --- a/config/rbac/service_account.yaml +++ b/config/rbac/service_account.yaml @@ -1,5 +1,5 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: controller-manager + name: onepassword-connect-operator namespace: system From b05c0661a0beb7d61adfb9518a3be5d9f4a1b5a0 Mon Sep 17 00:00:00 2001 From: volodymyrZotov Date: Mon, 31 Oct 2022 18:07:53 +0200 Subject: [PATCH 2/3] changed label --- config/manager/manager.yaml | 6 +++--- config/prometheus/monitor.yaml | 4 ++-- config/rbac/auth_proxy_service.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 5510987..9412c1b 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -4,18 +4,18 @@ metadata: name: onepassword-connect-operator namespace: system labels: - control-plane: onepassword-connect-operator + name: onepassword-connect-operator spec: selector: matchLabels: - control-plane: onepassword-connect-operator + name: onepassword-connect-operator replicas: 1 template: metadata: annotations: kubectl.kubernetes.io/default-container: manager labels: - control-plane: onepassword-connect-operator + name: onepassword-connect-operator spec: securityContext: runAsNonRoot: true diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 67c9bf0..b170c38 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - control-plane: onepassword-connect-operator + name: onepassword-connect-operator name: onepassword-connect-operator-metrics-monitor namespace: system spec: @@ -17,4 +17,4 @@ spec: insecureSkipVerify: true selector: matchLabels: - control-plane: onepassword-connect-operator + name: onepassword-connect-operator diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml index c57d52f..4de8e6a 100644 --- a/config/rbac/auth_proxy_service.yaml +++ b/config/rbac/auth_proxy_service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - control-plane: onepassword-connect-operator + name: onepassword-connect-operator name: onepassword-connect-operator-metrics-service namespace: system spec: @@ -12,4 +12,4 @@ spec: protocol: TCP targetPort: https selector: - control-plane: onepassword-connect-operator + name: onepassword-connect-operator From cb48c9c902c393e66aadf0ff8b3789bda353f668 Mon Sep 17 00:00:00 2001 From: volodymyrZotov Date: Mon, 31 Oct 2022 18:19:59 +0200 Subject: [PATCH 3/3] remove imagePullPolicy from manager.yaml --- config/manager/manager.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 9412c1b..2d9ba39 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -32,7 +32,6 @@ spec: args: - --leader-elect image: 1password/onepassword-operator:latest - imagePullPolicy: Never # TODO: remove name: manager env: - name: WATCH_NAMESPACE