Skip to content

Commit

Permalink
Merge branch 'main' into update_ready_last_operator
Browse files Browse the repository at this point in the history
  • Loading branch information
nesmabadr committed Apr 16, 2024
2 parents a2af26d + 132df28 commit 9b6f4fa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/actions/setup-test-clusters/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ inputs:
cert_manager_version:
description: The version of cert-manager to depoy. For example, 1.13.3.
required: true
additional_skr_args:
description: Additional arguments to pass to the k3d create command for the SKR cluster separated by semicolon (;).
required: false
runs:
using: composite
steps:
Expand All @@ -15,7 +18,7 @@ runs:
with:
cluster_name: skr
k8s_version: ${{ inputs.k8s_version }}
args: "-p 10080:80@loadbalancer;-p 10443:443@loadbalancer"
args: "-p 10080:80@loadbalancer;-p 10443:443@loadbalancer;${{ inputs.additional_skr_args }}"
- uses: ./lifecycle-manager/.github/actions/create-k3d-cluster
with:
cluster_name: kcp
Expand Down
3 changes: 2 additions & 1 deletion pkg/testutils/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,8 @@ func ExpectManifestStateIn(ctx context.Context, clnt client.Client,
}

func ExpectManifestLastOperationMessageContains(ctx context.Context, clnt client.Client,
manifestName, message string) error {
manifestName, message string,
) error {
manifest, err := GetManifestWithName(ctx, clnt, manifestName)
if err != nil {
return err
Expand Down

0 comments on commit 9b6f4fa

Please sign in to comment.