Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused ocp3 option from CI cluster config (1.12.x branch) #4387

Merged
merged 1 commit into from
May 18, 2023
Merged

Remove unused ocp3 option from CI cluster config (1.12.x branch) #4387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
233 changes: 0 additions & 233 deletions .github/actions/kamel-config-cluster-ocp3/action.yml
View file
Open in desktop

This file was deleted.

23 changes: 3 additions & 20 deletions .github/actions/kamel-config-cluster/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

#
Expand Down
Loading