Skip to content

Commit

Permalink
control-plane:controller-manager is not unique. use susql-controller-…
Browse files Browse the repository at this point in the history
…manager

Signed-off-by: Scott Trent <[email protected]>
  • Loading branch information
trent-s committed Apr 23, 2024
1 parent 8adb220 commit 1e831d2
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 41 deletions.
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Security Policy

Our intent is to resolve security issues in a timely fasion.
Our intent is to address security issues in a timely fasion.
Since we can release frequently, security issues will be fixed in the next minor release.

## Supported Versions

| Version | Supported |
| ------- | ------------------ |
| >=latest | :white_check_mark: |
| < 0.0.6 | :x: |
| < latest | :x: |

## Reporting a Vulnerability

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.6
0.0.7
31 changes: 17 additions & 14 deletions bundle/manifests/susql-operator.clusterserviceversion.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
name: susql-controller-manager
namespace: system
spec:
template:
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_config_patch.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
name: susql-controller-manager
namespace: system
spec:
template:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/sustainable_computing_io/susql_operator
newTag: 0.0.6
newTag: 0.0.7
14 changes: 7 additions & 7 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
control-plane: controller-manager
control-plane: susql-controller-manager
app.kubernetes.io/name: namespace
app.kubernetes.io/instance: system
app.kubernetes.io/component: manager
Expand All @@ -14,27 +14,27 @@ metadata:
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
name: susql-controller-manager
namespace: system
labels:
control-plane: controller-manager
control-plane: susql-controller-manager
app.kubernetes.io/name: deployment
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/instance: susql-controller-manager
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: susql-operator
app.kubernetes.io/part-of: susql-operator
app.kubernetes.io/managed-by: kustomize
spec:
selector:
matchLabels:
control-plane: controller-manager
control-plane: susql-controller-manager
replicas: 1
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
labels:
control-plane: controller-manager
control-plane: susql-controller-manager
spec:
# TODO(user): Uncomment the following code to configure the nodeAffinity expression
# according to the platforms which are supported by your solution.
Expand Down Expand Up @@ -117,5 +117,5 @@ spec:
requests:
cpu: 10m
memory: 64Mi
serviceAccountName: controller-manager
serviceAccountName: susql-controller-manager
terminationGracePeriodSeconds: 10
2 changes: 1 addition & 1 deletion config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ resources:
# group: apps
# version: v1
# kind: Deployment
# name: controller-manager
# name: susql-controller-manager
# namespace: system
# patch: |-
# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
Expand Down
8 changes: 4 additions & 4 deletions config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
control-plane: susql-controller-manager
app.kubernetes.io/name: servicemonitor
app.kubernetes.io/instance: controller-manager-metrics-monitor
app.kubernetes.io/instance: susql-controller-manager-metrics-monitor
app.kubernetes.io/component: metrics
app.kubernetes.io/created-by: susql-operator
app.kubernetes.io/part-of: susql-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-monitor
name: susql-controller-manager-metrics-monitor
namespace: system
spec:
endpoints:
Expand All @@ -23,4 +23,4 @@ spec:
insecureSkipVerify: true
selector:
matchLabels:
control-plane: controller-manager
control-plane: susql-controller-manager
2 changes: 1 addition & 1 deletion config/rbac/auth_proxy_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ roleRef:
name: proxy-role
subjects:
- kind: ServiceAccount
name: controller-manager
name: susql-controller-manager
namespace: system
8 changes: 4 additions & 4 deletions config/rbac/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apiVersion: v1
kind: Service
metadata:
labels:
control-plane: controller-manager
control-plane: susql-controller-manager
app.kubernetes.io/name: service
app.kubernetes.io/instance: controller-manager-metrics-service
app.kubernetes.io/instance: susql-controller-manager-metrics-service
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: susql-operator
app.kubernetes.io/part-of: susql-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-service
name: susql-controller-manager-metrics-service
namespace: system
spec:
ports:
Expand All @@ -18,4 +18,4 @@ spec:
protocol: TCP
targetPort: https
selector:
control-plane: controller-manager
control-plane: susql-controller-manager
2 changes: 1 addition & 1 deletion config/rbac/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ roleRef:
name: leader-election-role
subjects:
- kind: ServiceAccount
name: controller-manager
name: susql-controller-manager
namespace: system
2 changes: 1 addition & 1 deletion config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ roleRef:
name: manager-role
subjects:
- kind: ServiceAccount
name: controller-manager
name: susql-controller-manager
namespace: system
4 changes: 2 additions & 2 deletions config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: serviceaccount
app.kubernetes.io/instance: controller-manager-sa
app.kubernetes.io/instance: susql-controller-manager-sa
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: susql-operator
app.kubernetes.io/part-of: susql-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager
name: susql-controller-manager
namespace: system

0 comments on commit 1e831d2

Please sign in to comment.