This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1d74661ad7c23997a047764c9513ba748d7b5c52
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Sat Nov 23 10:13:54 2024 +0100
fix(install): allow Jib executable on OCP
Ref #5771
---
.../overlays/openshift/descoped/kustomization.yaml | 33 --------
.../openshift/descoped/patch-operator-id.yaml | 20 -----
.../descoped/patch-watch-namespace-global.yaml | 22 -----
.../openshift/namespaced/kustomization.yaml | 30 -------
.../openshift/namespaced/patch-operator-id.yaml | 20 -----
.../config/rbac/descoped/kustomization.yaml | 2 +
.../operator-cluster-role-binding-openshift.yaml | 0
.../descoped/operator-cluster-role-openshift.yaml | 0
.../config/rbac/namespaced/kustomization.yaml | 2 +
...tor-cluster-role-console-binding-openshift.yaml | 0
.../operator-cluster-role-console-openshift.yaml | 0
.../rbac/openshift/descoped/kustomization.yaml | 26 ------
.../config/rbac/openshift/kustomization.yaml | 26 ------
.../rbac/openshift/namespaced/kustomization.yaml | 26 ------
.../operator-role-binding-openshift.yaml | 30 -------
.../namespaced/operator-role-openshift.yaml | 99 ----------------------
16 files changed, 4 insertions(+), 332 deletions(-)
diff --git a/install/overlays/openshift/descoped/kustomization.yaml
b/install/overlays/openshift/descoped/kustomization.yaml
deleted file mode 100644
index ff7ed314f..000000000
--- a/install/overlays/openshift/descoped/kustomization.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- ../../kubernetes/descoped
-- ../../../base/config/rbac/openshift
-- ../../../base/config/rbac/openshift/descoped
-
-namespace: camel-k
-
-patches:
-- path: patch-watch-namespace-global.yaml
- target:
- kind: Deployment
-- path: patch-operator-id.yaml
- target:
- kind: Deployment
\ No newline at end of file
diff --git a/install/overlays/openshift/descoped/patch-operator-id.yaml
b/install/overlays/openshift/descoped/patch-operator-id.yaml
deleted file mode 100644
index 25c150420..000000000
--- a/install/overlays/openshift/descoped/patch-operator-id.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-- op: add
- path: /spec/template/spec/containers/0/env/2/value
- value: camel-k
diff --git
a/install/overlays/openshift/descoped/patch-watch-namespace-global.yaml
b/install/overlays/openshift/descoped/patch-watch-namespace-global.yaml
deleted file mode 100644
index 69c6ae502..000000000
--- a/install/overlays/openshift/descoped/patch-watch-namespace-global.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-- op: remove
- path: /spec/template/spec/containers/0/env/0/valueFrom
-- op: add
- path: /spec/template/spec/containers/0/env/0/value
- value: ""
diff --git a/install/overlays/openshift/namespaced/kustomization.yaml
b/install/overlays/openshift/namespaced/kustomization.yaml
deleted file mode 100644
index ad71b3259..000000000
--- a/install/overlays/openshift/namespaced/kustomization.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- ../../kubernetes/namespaced
-- ../../../base/config/rbac/openshift
-- ../../../base/config/rbac/openshift/namespaced
-
-namespace: default
-
-patches:
-- path: patch-operator-id.yaml
- target:
- kind: Deployment
\ No newline at end of file
diff --git a/install/overlays/openshift/namespaced/patch-operator-id.yaml
b/install/overlays/openshift/namespaced/patch-operator-id.yaml
deleted file mode 100644
index 25c150420..000000000
--- a/install/overlays/openshift/namespaced/patch-operator-id.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-- op: add
- path: /spec/template/spec/containers/0/env/2/value
- value: camel-k
diff --git a/pkg/resources/config/rbac/descoped/kustomization.yaml
b/pkg/resources/config/rbac/descoped/kustomization.yaml
index 7eed13633..68f35074a 100644
--- a/pkg/resources/config/rbac/descoped/kustomization.yaml
+++ b/pkg/resources/config/rbac/descoped/kustomization.yaml
@@ -27,12 +27,14 @@ resources:
- operator-cluster-role-keda.yaml
- operator-cluster-role-knative.yaml
- operator-cluster-role-leases.yaml
+- operator-cluster-role-openshift.yaml
- operator-cluster-role-podmonitors.yaml
- operator-cluster-role-strimzi.yaml
- operator-cluster-role-binding-events.yaml
- operator-cluster-role-binding-keda.yaml
- operator-cluster-role-binding-knative.yaml
- operator-cluster-role-binding-leases.yaml
+- operator-cluster-role-binding-openshift.yaml
- operator-cluster-role-binding-podmonitors.yaml
- operator-cluster-role-binding-strimzi.yaml
- operator-cluster-role-binding.yaml
diff --git
a/pkg/resources/config/rbac/openshift/descoped/operator-cluster-role-binding-openshift.yaml
b/pkg/resources/config/rbac/descoped/operator-cluster-role-binding-openshift.yaml
similarity index 100%
rename from
pkg/resources/config/rbac/openshift/descoped/operator-cluster-role-binding-openshift.yaml
rename to
pkg/resources/config/rbac/descoped/operator-cluster-role-binding-openshift.yaml
diff --git
a/pkg/resources/config/rbac/openshift/descoped/operator-cluster-role-openshift.yaml
b/pkg/resources/config/rbac/descoped/operator-cluster-role-openshift.yaml
similarity index 100%
rename from
pkg/resources/config/rbac/openshift/descoped/operator-cluster-role-openshift.yaml
rename to
pkg/resources/config/rbac/descoped/operator-cluster-role-openshift.yaml
diff --git a/pkg/resources/config/rbac/namespaced/kustomization.yaml
b/pkg/resources/config/rbac/namespaced/kustomization.yaml
index 134668d86..1859bd544 100644
--- a/pkg/resources/config/rbac/namespaced/kustomization.yaml
+++ b/pkg/resources/config/rbac/namespaced/kustomization.yaml
@@ -27,6 +27,7 @@ resources:
- operator-role-keda.yaml
- operator-role-knative.yaml
- operator-role-leases.yaml
+- operator-role-openshift.yaml
- operator-role-podmonitors.yaml
- operator-role-strimzi.yaml
- operator-role-binding.yaml
@@ -34,5 +35,6 @@ resources:
- operator-role-binding-keda.yaml
- operator-role-binding-knative.yaml
- operator-role-binding-leases.yaml
+- operator-role-binding-openshift.yaml
- operator-role-binding-podmonitors.yaml
- operator-role-binding-strimzi.yaml
diff --git
a/pkg/resources/config/rbac/openshift/operator-cluster-role-console-binding-openshift.yaml
b/pkg/resources/config/rbac/namespaced/operator-cluster-role-console-binding-openshift.yaml
similarity index 100%
rename from
pkg/resources/config/rbac/openshift/operator-cluster-role-console-binding-openshift.yaml
rename to
pkg/resources/config/rbac/namespaced/operator-cluster-role-console-binding-openshift.yaml
diff --git
a/pkg/resources/config/rbac/openshift/operator-cluster-role-console-openshift.yaml
b/pkg/resources/config/rbac/namespaced/operator-cluster-role-console-openshift.yaml
similarity index 100%
rename from
pkg/resources/config/rbac/openshift/operator-cluster-role-console-openshift.yaml
rename to
pkg/resources/config/rbac/namespaced/operator-cluster-role-console-openshift.yaml
diff --git a/pkg/resources/config/rbac/openshift/descoped/kustomization.yaml
b/pkg/resources/config/rbac/openshift/descoped/kustomization.yaml
deleted file mode 100644
index 35cf76e40..000000000
--- a/pkg/resources/config/rbac/openshift/descoped/kustomization.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-#
-# rbac resources applicable for all kubernetes platforms - global operator
-#
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- operator-cluster-role-openshift.yaml
-- operator-cluster-role-binding-openshift.yaml
diff --git a/pkg/resources/config/rbac/openshift/kustomization.yaml
b/pkg/resources/config/rbac/openshift/kustomization.yaml
deleted file mode 100644
index 4920f6600..000000000
--- a/pkg/resources/config/rbac/openshift/kustomization.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-#
-# rbac resources applicable for only openshift platforms
-#
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- operator-cluster-role-console-binding-openshift.yaml
-- operator-cluster-role-console-openshift.yaml
diff --git a/pkg/resources/config/rbac/openshift/namespaced/kustomization.yaml
b/pkg/resources/config/rbac/openshift/namespaced/kustomization.yaml
deleted file mode 100644
index 0fc781320..000000000
--- a/pkg/resources/config/rbac/openshift/namespaced/kustomization.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-#
-# rbac resources applicable for all kubernetes platforms - global operator
-#
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- operator-role-openshift.yaml
-- operator-role-binding-openshift.yaml
diff --git
a/pkg/resources/config/rbac/openshift/namespaced/operator-role-binding-openshift.yaml
b/pkg/resources/config/rbac/openshift/namespaced/operator-role-binding-openshift.yaml
deleted file mode 100644
index 54dbe28d1..000000000
---
a/pkg/resources/config/rbac/openshift/namespaced/operator-role-binding-openshift.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
- name: camel-k-operator-openshift
- labels:
- app: "camel-k"
-subjects:
-- kind: ServiceAccount
- name: camel-k-operator
-roleRef:
- kind: Role
- name: camel-k-operator-openshift
- apiGroup: rbac.authorization.k8s.io
diff --git
a/pkg/resources/config/rbac/openshift/namespaced/operator-role-openshift.yaml
b/pkg/resources/config/rbac/openshift/namespaced/operator-role-openshift.yaml
deleted file mode 100644
index f6f362f37..000000000
---
a/pkg/resources/config/rbac/openshift/namespaced/operator-role-openshift.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
- name: camel-k-operator-openshift
- labels:
- app: "camel-k"
-rules:
-- apiGroups:
- - camel.apache.org
- resources:
- - builds/finalizers
- - integrationkits/finalizers
- - integrationplatforms/finalizers
- - integrationprofiles/finalizers
- - integrations/finalizers
- - pipes/finalizers
- verbs:
- - update
-- apiGroups:
- - ""
- - "build.openshift.io"
- resources:
- - buildconfigs
- - buildconfigs/webhooks
- - builds
- verbs:
- - create
- - delete
- - deletecollection
- - get
- - list
- - patch
- - update
- - watch
-- apiGroups:
- - ""
- - "image.openshift.io"
- resources:
- - imagestreamimages
- - imagestreammappings
- - imagestreams
- - imagestreams/secrets
- - imagestreamtags
- verbs:
- - create
- - delete
- - deletecollection
- - get
- - list
- - patch
- - update
- - watch
-- apiGroups:
- - ""
- - build.openshift.io
- resources:
- - buildconfigs/instantiate
- - buildconfigs/instantiatebinary
- - builds/clone
- verbs:
- - create
-- apiGroups:
- - ""
- - "route.openshift.io"
- resources:
- - routes
- verbs:
- - create
- - delete
- - deletecollection
- - get
- - list
- - patch
- - update
- - watch
-- apiGroups:
- - ""
- - route.openshift.io
- resources:
- - routes/custom-host
- verbs:
- - create
