diff --git a/Makefile b/Makefile index d6a364bba..b38e83aa8 100644 --- a/Makefile +++ b/Makefile @@ -392,8 +392,8 @@ endif bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files. $(OPERATOR_SDK) generate kustomize manifests -q cd config/operator/deployment/ && $(KUSTOMIZE) edit set image controller=$(IMG) && \ - $(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)\"}}]" && \ - $(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)\"}}]" + $(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)\"}}]" && \ + $(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)\"}}]" $(KUSTOMIZE) build config/operator --load-restrictor='LoadRestrictionsNone' | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) $(OPERATOR_SDK) bundle validate ./bundle diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml index e2a3e6bea..a1bee6c67 100644 --- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml @@ -436,6 +436,13 @@ spec: - description: TLS - overrides tls parameters for public endpoint displayName: TLS path: telemetry.aodhApiOverride.tls + - description: CloudKittyAPIOverride, provides the ability to override the generated + manifest of several child resources. + displayName: Cloud Kitty APIOverride + path: telemetry.cloudKittyApiOverride + - description: TLS - overrides tls parameters for public endpoint + displayName: TLS + path: telemetry.cloudKittyApiOverride.tls - description: Enabled - Whether OpenStack Telemetry services should be deployed and managed displayName: Enabled diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 46597950e..430bc00ce 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: openstack-operator-controller-operator + name: openstack-operator-controller-init namespace: system spec: template: diff --git a/config/operator/deployment/deployment.yaml b/config/operator/deployment/deployment.yaml index 22e38854a..076440847 100644 --- a/config/operator/deployment/deployment.yaml +++ b/config/operator/deployment/deployment.yaml @@ -2,23 +2,23 @@ apiVersion: v1 kind: Namespace metadata: labels: - app.kubernetes.io/name: openstack-operator-controller-operator + app.kubernetes.io/name: openstack-operator-controller-init control-plane: controller-manager name: system --- apiVersion: apps/v1 kind: Deployment metadata: - name: openstack-operator-controller-operator + name: openstack-operator-controller-init namespace: system labels: - app.kubernetes.io/name: openstack-operator-controller-operator + app.kubernetes.io/name: openstack-operator-controller-init control-plane: controller-manager openstack.org/operator-name: openstack-init spec: selector: matchLabels: - app.kubernetes.io/name: openstack-operator-controller-operator + app.kubernetes.io/name: openstack-operator-controller-init control-plane: controller-manager openstack.org/operator-name: openstack-init replicas: 1 @@ -27,7 +27,7 @@ spec: annotations: kubectl.kubernetes.io/default-container: operator labels: - app.kubernetes.io/name: openstack-operator-controller-operator + app.kubernetes.io/name: openstack-operator-controller-init control-plane: controller-manager openstack.org/operator-name: openstack-init spec: @@ -89,7 +89,7 @@ spec: requests: cpu: 10m memory: 128Mi - serviceAccountName: openstack-operator-controller-operator + serviceAccountName: openstack-operator-controller-init terminationGracePeriodSeconds: 10 tolerations: - key: "node.kubernetes.io/not-ready" diff --git a/config/operator/deployment/kustomization.yaml b/config/operator/deployment/kustomization.yaml index 6ca4c7dc7..c0f1e3f50 100644 --- a/config/operator/deployment/kustomization.yaml +++ b/config/operator/deployment/kustomization.yaml @@ -14,3 +14,16 @@ images: - name: controller newName: quay.io/openstack-k8s-operators/openstack-operator newTag: latest +patches: +- patch: '[{"op": "replace", "path": "/spec/template/spec/containers/0/env/0", "value": + {"name": "OPENSTACK_RELEASE_VERSION", "value": "0.5.0-1767875480"}}]' + target: + 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": "quay.io/openstack-k8s-operators/openstack-operator:latest"}}]' + target: + kind: Deployment + name: openstack-operator-controller-init + namespace: system diff --git a/config/operator/manager_operator_images.yaml b/config/operator/manager_operator_images.yaml index 233231e49..3bb63079f 100644 --- a/config/operator/manager_operator_images.yaml +++ b/config/operator/manager_operator_images.yaml @@ -5,7 +5,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: openstack-operator-controller-operator + name: openstack-operator-controller-init namespace: system spec: template: diff --git a/config/operator/rbac/leader_election_role.yaml b/config/operator/rbac/leader_election_role.yaml index 76ce2df89..ff0e9c410 100644 --- a/config/operator/rbac/leader_election_role.yaml +++ b/config/operator/rbac/leader_election_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - app.kubernetes.io/name: openstack-operator-controller-operator + app.kubernetes.io/name: openstack-operator-controller-init app.kubernetes.io/managed-by: kustomize name: leader-election-role-operator rules: diff --git a/config/operator/rbac/leader_election_role_binding.yaml b/config/operator/rbac/leader_election_role_binding.yaml index fe8f9fdb5..822234ff5 100644 --- a/config/operator/rbac/leader_election_role_binding.yaml +++ b/config/operator/rbac/leader_election_role_binding.yaml @@ -11,5 +11,5 @@ roleRef: name: leader-election-role-operator subjects: - kind: ServiceAccount - name: openstack-operator-controller-operator + name: openstack-operator-controller-init namespace: system diff --git a/config/operator/rbac/metrics_auth_role_binding.yaml b/config/operator/rbac/metrics_auth_role_binding.yaml index e51e856b6..aa5438651 100644 --- a/config/operator/rbac/metrics_auth_role_binding.yaml +++ b/config/operator/rbac/metrics_auth_role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: metrics-auth-role-operator subjects: - kind: ServiceAccount - name: openstack-operator-controller-operator + name: openstack-operator-controller-init namespace: system diff --git a/config/operator/rbac/role_binding.yaml b/config/operator/rbac/role_binding.yaml index f89933b5e..d3ea647bd 100644 --- a/config/operator/rbac/role_binding.yaml +++ b/config/operator/rbac/role_binding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/name: openstack-operator-controller-operator + app.kubernetes.io/name: openstack-operator-controller-init app.kubernetes.io/managed-by: kustomize name: operator-rolebinding roleRef: @@ -11,5 +11,5 @@ roleRef: name: operator-role subjects: - kind: ServiceAccount - name: openstack-operator-controller-operator + name: openstack-operator-controller-init namespace: system diff --git a/config/operator/rbac/service_account.yaml b/config/operator/rbac/service_account.yaml index ad2ef0f8e..17de22d87 100644 --- a/config/operator/rbac/service_account.yaml +++ b/config/operator/rbac/service_account.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: openstack-operator-controller-operator + app.kubernetes.io/name: openstack-operator-controller-init app.kubernetes.io/managed-by: kustomize - name: controller-operator + name: controller-init namespace: system diff --git a/hack/run_with_local_webhook.sh b/hack/run_with_local_webhook.sh index c847f3a03..68f294193 100755 --- a/hack/run_with_local_webhook.sh +++ b/hack/run_with_local_webhook.sh @@ -400,7 +400,7 @@ if [ -n "${CSV_NAME}" ]; then oc patch "${CSV_NAME}" -n openstack-operators --type=json -p="[{'op': 'replace', 'path': '/spec/install/spec/deployments/0/spec/replicas', 'value': 0}]" oc patch "${CSV_NAME}" -n openstack-operators --type=json -p="[{'op': 'replace', 'path': '/spec/webhookdefinitions', 'value': []}]" - oc wait -n openstack-operators --for=jsonpath='{.spec.replicas}'=0 deploy/openstack-operator-controller-operator + oc wait -n openstack-operators --for=jsonpath='{.spec.replicas}'=0 deploy/openstack-operator-controller-init oc scale --replicas=0 -n openstack-operators deploy/openstack-operator-controller-manager oc delete --ignore-not-found=true validatingwebhookconfiguration openstack-operator-validating-webhook-configuration oc delete --ignore-not-found=true mutatingwebhookconfiguration openstack-operator-mutating-webhook-configuration diff --git a/hack/sync-bindata.sh b/hack/sync-bindata.sh index 0ce7b23a1..0d7e2382b 100755 --- a/hack/sync-bindata.sh +++ b/hack/sync-bindata.sh @@ -353,7 +353,7 @@ cat > ../config/operator/manager_operator_images.yaml <