diff --git a/config/openshift-trusted-cabundle.yaml b/config/openshift-trusted-cabundle.yaml new file mode 100644 index 00000000000..2b13829bf8a --- /dev/null +++ b/config/openshift-trusted-cabundle.yaml @@ -0,0 +1,23 @@ +# Copyright 2020 The Knative Authors +# +# Licensed 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 +# +# https://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: v1 +kind: ConfigMap +metadata: + name: config-openshift-trusted-cabundle + namespace: knative-eventing + labels: + app.kubernetes.io/version: devel + app.kubernetes.io/name: knative-eventing + config.openshift.io/inject-trusted-cabundle: "true" diff --git a/openshift/patches/023-configmap-trusted-cabundle.patch b/openshift/patches/023-configmap-trusted-cabundle.patch new file mode 100644 index 00000000000..edf4f406ba7 --- /dev/null +++ b/openshift/patches/023-configmap-trusted-cabundle.patch @@ -0,0 +1,30 @@ +diff --git a/config/openshift-trusted-cabundle.yaml b/config/openshift-trusted-cabundle.yaml +new file mode 100644 +index 000000000..a4c1a5f73 +--- /dev/null ++++ b/config/openshift-trusted-cabundle.yaml +@@ -0,0 +1,23 @@ ++# Copyright 2020 The Knative Authors ++# ++# Licensed 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 ++# ++# https://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: v1 ++kind: ConfigMap ++metadata: ++ name: config-openshift-trusted-cabundle ++ namespace: knative-eventing ++ labels: ++ app.kubernetes.io/version: devel ++ app.kubernetes.io/name: knative-eventing ++ config.openshift.io/inject-trusted-cabundle: "true" +-- diff --git a/openshift/release/artifacts/eventing-core.yaml b/openshift/release/artifacts/eventing-core.yaml index 0e0a6479256..2eaa4d63762 100644 --- a/openshift/release/artifacts/eventing-core.yaml +++ b/openshift/release/artifacts/eventing-core.yaml @@ -5033,3 +5033,27 @@ roleRef: apiGroup: rbac.authorization.k8s.io kind: Role name: openshift-serverless-view-eventing-configmaps +--- +# Copyright 2020 The Knative Authors +# +# Licensed 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 +# +# https://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: v1 +kind: ConfigMap +metadata: + name: config-openshift-trusted-cabundle + namespace: knative-eventing + labels: + app.kubernetes.io/version: v1.11 + app.kubernetes.io/name: knative-eventing + config.openshift.io/inject-trusted-cabundle: "true"