Skip to content

Commit 889c396

Browse files
dprincedprince
committed
Rename openstack-operator-controller-operator
This renames the deployment for the openstack-operator-controller-operator which services the OpenStack initialization CR. This will force OLM to reinstall it rather than update it thus avoiding issues in the label additions and modifications that we made when updating operator-sdk. Jira: OSPRH-24730
1 parent c92ad83 commit 889c396

14 files changed

Lines changed: 40 additions & 20 deletions

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ endif
392392
bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
393393
$(OPERATOR_SDK) generate kustomize manifests -q
394394
cd config/operator/deployment/ && $(KUSTOMIZE) edit set image controller=$(IMG) && \
395-
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]" && \
396-
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/1\", \"value\": {\"name\": \"OPERATOR_IMAGE_URL\", \"value\": \"$(IMG)\"}}]"
395+
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-init --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]" && \
396+
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-init --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/1\", \"value\": {\"name\": \"OPERATOR_IMAGE_URL\", \"value\": \"$(IMG)\"}}]"
397397
$(KUSTOMIZE) build config/operator --load-restrictor='LoadRestrictionsNone' | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
398398
$(OPERATOR_SDK) bundle validate ./bundle
399399

‎config/manifests/bases/openstack-operator.clusterserviceversion.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,13 @@ spec:
436436
- description: TLS - overrides tls parameters for public endpoint
437437
displayName: TLS
438438
path: telemetry.aodhApiOverride.tls
439+
- description: CloudKittyAPIOverride, provides the ability to override the generated
440+
manifest of several child resources.
441+
displayName: Cloud Kitty APIOverride
442+
path: telemetry.cloudKittyApiOverride
443+
- description: TLS - overrides tls parameters for public endpoint
444+
displayName: TLS
445+
path: telemetry.cloudKittyApiOverride.tls
439446
- description: Enabled - Whether OpenStack Telemetry services should be deployed
440447
and managed
441448
displayName: Enabled

‎config/operator/default_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: apps/v1
44
kind: Deployment
55
metadata:
6-
name: openstack-operator-controller-operator
6+
name: openstack-operator-controller-init
77
namespace: system
88
spec:
99
template:

‎config/operator/deployment/deployment.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
labels:
5-
app.kubernetes.io/name: openstack-operator-controller-operator
5+
app.kubernetes.io/name: openstack-operator-controller-init
66
control-plane: controller-manager
77
name: system
88
---
99
apiVersion: apps/v1
1010
kind: Deployment
1111
metadata:
12-
name: openstack-operator-controller-operator
12+
name: openstack-operator-controller-init
1313
namespace: system
1414
labels:
15-
app.kubernetes.io/name: openstack-operator-controller-operator
15+
app.kubernetes.io/name: openstack-operator-controller-init
1616
control-plane: controller-manager
1717
openstack.org/operator-name: openstack-init
1818
spec:
1919
selector:
2020
matchLabels:
21-
app.kubernetes.io/name: openstack-operator-controller-operator
21+
app.kubernetes.io/name: openstack-operator-controller-init
2222
control-plane: controller-manager
2323
openstack.org/operator-name: openstack-init
2424
replicas: 1
@@ -27,7 +27,7 @@ spec:
2727
annotations:
2828
kubectl.kubernetes.io/default-container: operator
2929
labels:
30-
app.kubernetes.io/name: openstack-operator-controller-operator
30+
app.kubernetes.io/name: openstack-operator-controller-init
3131
control-plane: controller-manager
3232
openstack.org/operator-name: openstack-init
3333
spec:
@@ -89,7 +89,7 @@ spec:
8989
requests:
9090
cpu: 10m
9191
memory: 128Mi
92-
serviceAccountName: openstack-operator-controller-operator
92+
serviceAccountName: openstack-operator-controller-init
9393
terminationGracePeriodSeconds: 10
9494
tolerations:
9595
- key: "node.kubernetes.io/not-ready"

‎config/operator/deployment/kustomization.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,16 @@ images:
1414
- name: controller
1515
newName: quay.io/openstack-k8s-operators/openstack-operator
1616
newTag: latest
17+
patches:
18+
- patch: '[{"op": "replace", "path": "/spec/template/spec/containers/0/env/0", "value":
19+
{"name": "OPENSTACK_RELEASE_VERSION", "value": "0.5.0-1767875480"}}]'
20+
target:
21+
kind: Deployment
22+
name: openstack-operator-controller-init
23+
namespace: system
24+
- patch: '[{"op": "replace", "path": "/spec/template/spec/containers/0/env/1", "value":
25+
{"name": "OPERATOR_IMAGE_URL", "value": "quay.io/openstack-k8s-operators/openstack-operator:latest"}}]'
26+
target:
27+
kind: Deployment
28+
name: openstack-operator-controller-init
29+
namespace: system

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
apiVersion: apps/v1
66
kind: Deployment
77
metadata:
8-
name: openstack-operator-controller-operator
8+
name: openstack-operator-controller-init
99
namespace: system
1010
spec:
1111
template:

‎config/operator/rbac/leader_election_role.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
55
labels:
6-
app.kubernetes.io/name: openstack-operator-controller-operator
6+
app.kubernetes.io/name: openstack-operator-controller-init
77
app.kubernetes.io/managed-by: kustomize
88
name: leader-election-role-operator
99
rules:

‎config/operator/rbac/leader_election_role_binding.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ roleRef:
1111
name: leader-election-role-operator
1212
subjects:
1313
- kind: ServiceAccount
14-
name: openstack-operator-controller-operator
14+
name: openstack-operator-controller-init
1515
namespace: system

‎config/operator/rbac/metrics_auth_role_binding.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: metrics-auth-role-operator
99
subjects:
1010
- kind: ServiceAccount
11-
name: openstack-operator-controller-operator
11+
name: openstack-operator-controller-init
1212
namespace: system

‎config/operator/rbac/role_binding.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
44
labels:
5-
app.kubernetes.io/name: openstack-operator-controller-operator
5+
app.kubernetes.io/name: openstack-operator-controller-init
66
app.kubernetes.io/managed-by: kustomize
77
name: operator-rolebinding
88
roleRef:
@@ -11,5 +11,5 @@ roleRef:
1111
name: operator-role
1212
subjects:
1313
- kind: ServiceAccount
14-
name: openstack-operator-controller-operator
14+
name: openstack-operator-controller-init
1515
namespace: system

0 commit comments

Comments
 (0)