diff --git a/serverless-operator/INFO.md b/serverless-operator/INFO.md index b94a015b..78977b97 100644 --- a/serverless-operator/INFO.md +++ b/serverless-operator/INFO.md @@ -14,7 +14,7 @@ automatically created when installing the operator. The components provided with the OpenShift Serverless operator require minimum cluster sizes on OpenShift Container Platform. For more information, see the documentation on [Getting started -with OpenShift Serverless](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.12/html/serverless/install#install-serverless-operator). +with OpenShift Serverless](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.13/html/serverless/installing-serverless#install-serverless-operator). # Supported Features - **Easy to get started:** Provides a simplified developer experience to deploy @@ -82,5 +82,5 @@ With its extensive help pages and autocompletion support, it frees you from memo # Further Information For documentation on OpenShift Serverless, see: - [Installation -Guide](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.12/html/serverless/install) -- [Develop Serverless Applications](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.12/html/serverless/develop) \ No newline at end of file +Guide](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.13/html/serverless/installing-serverless) +- [Develop Serverless Applications](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.13/html/serverless/serving#serverless-applications) \ No newline at end of file diff --git a/serverless-operator/README.md b/serverless-operator/README.md index cbcb7196..cd75ee33 100644 --- a/serverless-operator/README.md +++ b/serverless-operator/README.md @@ -7,6 +7,8 @@ Do not use the `base` directory directly, as you will need to patch the `channel The current *overlays* available are for the following channels: * [stable](operator/overlays/stable) +* [stable-1.29](operator/overlays/stable-1.29) +* [stable-1.30](operator/overlays/stable-1.30) ## Usage diff --git a/serverless-operator/operator/README.md b/serverless-operator/operator/README.md deleted file mode 100644 index 01cfaff7..00000000 --- a/serverless-operator/operator/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# OpenShift Serverless Operator - -Installs the OpenShift Serverless operator. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -The current *overlays* available are for the following channels: -* [4.5](overlays/4.5) -* [4.6](overlays/4.6) -* [4.7](overlays/4.7) - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install the OpenShift Serverless operator based on the overlay of your choice by running from the root `gitops-catalog` directory - -``` -oc apply -k openshift-serverless/operator/overlays/ -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-serverless/operator/overlays/ -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - github.com/redhat-cop/gitops-catalog/openshift-serverless/operator/overlays/?ref=main -``` diff --git a/serverless-operator/operator/overlays/4.5/README.md b/serverless-operator/operator/overlays/4.5/README.md deleted file mode 100644 index 390c27be..00000000 --- a/serverless-operator/operator/overlays/4.5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Installs the *OpenShift 4.5* channel version of the OpenShift Serverless Operator - -**Version: 1.10.1** \ No newline at end of file diff --git a/serverless-operator/operator/overlays/4.5/patch-channel.yaml b/serverless-operator/operator/overlays/4.5/patch-channel.yaml deleted file mode 100644 index 07f891af..00000000 --- a/serverless-operator/operator/overlays/4.5/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: '4.5' diff --git a/serverless-operator/operator/overlays/4.6/README.md b/serverless-operator/operator/overlays/4.6/README.md deleted file mode 100644 index 495f5914..00000000 --- a/serverless-operator/operator/overlays/4.6/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Installs the *OpenShift 4.6* channel version of the OpenShift Serverless Operator - -**Version: 1.13.0** \ No newline at end of file diff --git a/serverless-operator/operator/overlays/4.6/kustomization.yaml b/serverless-operator/operator/overlays/4.6/kustomization.yaml deleted file mode 100644 index fa4d2e79..00000000 --- a/serverless-operator/operator/overlays/4.6/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - - -resources: - - ../../base -patches: - - path: patch-channel.yaml - target: - group: operators.coreos.com - kind: Subscription - name: serverless-operator - namespace: openshift-operators - version: v1alpha1 diff --git a/serverless-operator/operator/overlays/4.7/README.md b/serverless-operator/operator/overlays/4.7/README.md deleted file mode 100644 index 917fd440..00000000 --- a/serverless-operator/operator/overlays/4.7/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Installs the *OpenShift 4.7* channel version of the OpenShift Serverless Operator - -**Version: 1.13.0** \ No newline at end of file diff --git a/serverless-operator/operator/overlays/4.7/kustomization.yaml b/serverless-operator/operator/overlays/stable-1.29/kustomization.yaml similarity index 53% rename from serverless-operator/operator/overlays/4.7/kustomization.yaml rename to serverless-operator/operator/overlays/stable-1.29/kustomization.yaml index fa4d2e79..7204e481 100644 --- a/serverless-operator/operator/overlays/4.7/kustomization.yaml +++ b/serverless-operator/operator/overlays/stable-1.29/kustomization.yaml @@ -1,15 +1,11 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../../base + patches: - - path: patch-channel.yaml - target: - group: operators.coreos.com + - target: kind: Subscription name: serverless-operator - namespace: openshift-operators - version: v1alpha1 + path: patch-channel.yaml diff --git a/serverless-operator/operator/overlays/4.6/patch-channel.yaml b/serverless-operator/operator/overlays/stable-1.29/patch-channel.yaml similarity index 63% rename from serverless-operator/operator/overlays/4.6/patch-channel.yaml rename to serverless-operator/operator/overlays/stable-1.29/patch-channel.yaml index 6d82a51c..12c0b7a5 100644 --- a/serverless-operator/operator/overlays/4.6/patch-channel.yaml +++ b/serverless-operator/operator/overlays/stable-1.29/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: '4.6' + value: stable-1.29 diff --git a/serverless-operator/operator/overlays/4.5/kustomization.yaml b/serverless-operator/operator/overlays/stable-1.30/kustomization.yaml similarity index 53% rename from serverless-operator/operator/overlays/4.5/kustomization.yaml rename to serverless-operator/operator/overlays/stable-1.30/kustomization.yaml index fa4d2e79..7204e481 100644 --- a/serverless-operator/operator/overlays/4.5/kustomization.yaml +++ b/serverless-operator/operator/overlays/stable-1.30/kustomization.yaml @@ -1,15 +1,11 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../../base + patches: - - path: patch-channel.yaml - target: - group: operators.coreos.com + - target: kind: Subscription name: serverless-operator - namespace: openshift-operators - version: v1alpha1 + path: patch-channel.yaml diff --git a/serverless-operator/operator/overlays/4.7/patch-channel.yaml b/serverless-operator/operator/overlays/stable-1.30/patch-channel.yaml similarity index 63% rename from serverless-operator/operator/overlays/4.7/patch-channel.yaml rename to serverless-operator/operator/overlays/stable-1.30/patch-channel.yaml index ae7a883f..e8d8cc20 100644 --- a/serverless-operator/operator/overlays/4.7/patch-channel.yaml +++ b/serverless-operator/operator/overlays/stable-1.30/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: '4.7' + value: stable-1.30