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
The following commit(s) were added to refs/heads/main by this push:
new a23f8f310 Remove unused ocp3 option from CI cluster config
a23f8f310 is described below
commit a23f8f310643ee8107abc4ef26f0a24e6747cb34
Author: Claudio Miranda <[email protected]>
AuthorDate: Wed May 17 20:06:50 2023 -0300
Remove unused ocp3 option from CI cluster config
---
.github/actions/kamel-config-cluster/action.yaml | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/.github/actions/kamel-config-cluster/action.yaml
b/.github/actions/kamel-config-cluster/action.yaml
index deea9af19..64e5c377a 100644
--- a/.github/actions/kamel-config-cluster/action.yaml
+++ b/.github/actions/kamel-config-cluster/action.yaml
@@ -20,7 +20,7 @@ description: 'Delegates to respective cluster action
depending on type of reques
inputs:
cluster-type:
- description: 'The type of cluster required: [kind, ocp3, custom] -
optional (see Override Cluster Type step)'
+ description: 'The type of cluster required: [kind, custom] - optional (see
Override Cluster Type step)'
required: false
cluster-config-data:
description: 'Variables for the cluster configuration - required for
custom cluster type only optional (see Override Cluster Type step)'
@@ -60,11 +60,6 @@ runs:
uses: ./.github/actions/kamel-config-cluster-kind
if: ${{ env.CLUSTER_TYPE == 'kind' }}
- - id: execute-ocp3
- name: Maybe Execute Minishift Cluster
- uses: ./.github/actions/kamel-config-cluster-ocp3
- if: ${{ env.CLUSTER_TYPE == 'ocp3' }}
-
- id: execute-custom
name: Maybe Execute Custom Cluster
uses: ./.github/actions/kamel-config-cluster-custom
@@ -75,10 +70,10 @@ runs:
- id: execute-invalid
name: Execute Invalid Cluster
- if: ${{ env.CLUSTER_TYPE != 'kind' && env.CLUSTER_TYPE != 'ocp3' &&
env.CLUSTER_TYPE != 'custom' }}
+ if: ${{ env.CLUSTER_TYPE != 'kind' && env.CLUSTER_TYPE != 'custom' }}
shell: bash
run: |
- echo "Error: Unrecognised cluster request for type of cluster. Should
be kind, ocp3 or custom."
+ echo "Error: Unrecognised cluster request for type of cluster. Should
be kind or custom."
exit 1
- id: cluster-config
@@ -111,18 +106,6 @@ runs:
-s "${{
steps.execute-custom.outputs.cluster-image-registry-insecure }}" \
-u "${{ steps.execute-custom.outputs.cluster-kube-user-ctx }}"
;;
- ocp3)
- # Does not require cluster-catalog-source-name or namespace
- ./.github/actions/kamel-config-cluster/output-config.sh \
- -a "${{ steps.execute-ocp3.outputs.cluster-kube-admin-user-ctx }}"
\
- -g "${{
steps.execute-ocp3.outputs.cluster-global-operator-namespace }}" \
- -n "${{ steps.execute-ocp3.outputs.cluster-image-namespace }}" \
- -o "${{ steps.execute-ocp3.outputs.cluster-has-olm }}" \
- -p "${{
steps.execute-ocp3.outputs.cluster-image-registry-push-host }}" \
- -q "${{
steps.execute-ocp3.outputs.cluster-image-registry-pull-host }}" \
- -s "${{ steps.execute-ocp3.outputs.cluster-image-registry-insecure
}}" \
- -u "${{ steps.execute-ocp3.outputs.cluster-kube-user-ctx }}"
- ;;
esac
#