From c15739df2dae7f51d529c6c9595022a780983345 Mon Sep 17 00:00:00 2001 From: Pasquale Congiusti Date: Tue, 21 Mar 2023 09:55:03 +0100 Subject: [PATCH] fix: kustomize revert placeholder namespace Revert 2d726544168391c7052818def932caf1071bbe50 as it is required by Kustomize procedure Closes #4142 --- config/manifests/bases/camel-k.clusterserviceversion.yaml | 1 + .../operator-cluster-role-console-binding-openshift.yaml | 1 + .../rbac/operator-cluster-role-binding-addressable-resolver.yaml | 1 + ...perator-cluster-role-binding-custom-resource-definitions.yaml | 1 + config/rbac/operator-role-binding-local-registry.yaml | 1 + install/Makefile | 1 + 6 files changed, 6 insertions(+) diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml index edf42aff34..d3d579d303 100644 --- a/config/manifests/bases/camel-k.clusterserviceversion.yaml +++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml @@ -32,6 +32,7 @@ metadata: repository: https://github.com/apache/camel-k support: Camel name: camel-k.v2.0.0 + namespace: placeholder spec: apiservicedefinitions: {} customresourcedefinitions: diff --git a/config/rbac/openshift/operator-cluster-role-console-binding-openshift.yaml b/config/rbac/openshift/operator-cluster-role-console-binding-openshift.yaml index f99d5486a5..fef037a6bb 100644 --- a/config/rbac/openshift/operator-cluster-role-console-binding-openshift.yaml +++ b/config/rbac/openshift/operator-cluster-role-console-binding-openshift.yaml @@ -24,6 +24,7 @@ metadata: subjects: - kind: ServiceAccount name: camel-k-operator + namespace: placeholder roleRef: kind: ClusterRole name: camel-k-operator-console-openshift diff --git a/config/rbac/operator-cluster-role-binding-addressable-resolver.yaml b/config/rbac/operator-cluster-role-binding-addressable-resolver.yaml index 1c32ba0858..bddbcfdfc6 100644 --- a/config/rbac/operator-cluster-role-binding-addressable-resolver.yaml +++ b/config/rbac/operator-cluster-role-binding-addressable-resolver.yaml @@ -24,6 +24,7 @@ metadata: subjects: - kind: ServiceAccount name: camel-k-operator + namespace: placeholder roleRef: kind: ClusterRole name: camel-k-operator-bind-addressable-resolver diff --git a/config/rbac/operator-cluster-role-binding-custom-resource-definitions.yaml b/config/rbac/operator-cluster-role-binding-custom-resource-definitions.yaml index d73ce7c112..14d3fa1a88 100644 --- a/config/rbac/operator-cluster-role-binding-custom-resource-definitions.yaml +++ b/config/rbac/operator-cluster-role-binding-custom-resource-definitions.yaml @@ -24,6 +24,7 @@ metadata: subjects: - kind: ServiceAccount name: camel-k-operator + namespace: placeholder roleRef: kind: ClusterRole name: camel-k-operator-custom-resource-definitions diff --git a/config/rbac/operator-role-binding-local-registry.yaml b/config/rbac/operator-role-binding-local-registry.yaml index 8bff035de9..56ed3c47dd 100644 --- a/config/rbac/operator-role-binding-local-registry.yaml +++ b/config/rbac/operator-role-binding-local-registry.yaml @@ -25,6 +25,7 @@ metadata: subjects: - kind: ServiceAccount name: camel-k-operator + namespace: placeholder roleRef: kind: ClusterRole name: camel-k-operator-local-registry diff --git a/install/Makefile b/install/Makefile index a6b546fecb..8df743873f 100644 --- a/install/Makefile +++ b/install/Makefile @@ -72,6 +72,7 @@ RBAC := $(CONFIG)/rbac RBAC_OS := $(RBAC)/openshift RBAC_GLOBAL := global OPERATOR := operator +PLACEHOLDER := placeholder YAML := yaml # Fetch the latest image name - may override the original constant