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

Pin Kind versions on release branches #2384

Merged
merged 5 commits into from
Jun 19, 2023
Merged

Pin Kind versions on release branches #2384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eabe144
pinned kind configuration for CI tests
wilkermichael Jun 15, 2023
2c23f40
updated input file with upper case
wilkermichael Jun 16, 2023
ad60fd7
updated input file with upper case
wilkermichael Jun 16, 2023
696945b
try a different way
curtbushko Jun 16, 2023
ab760ea
updated input file with upper case
wilkermichael Jun 16, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
with:
workflow: test.yml
repo: hashicorp/consul-k8s-workflows
ref: main
ref: mw/add-support-pinned-kind
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self: don't forget to switch this back to main

token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ consul-enterprise-version:
consul-dataplane-version:
@echo $(CONSUL_DATAPLANE_IMAGE_VERSION)

kind-config:
@./control-plane/build-support/scripts/read-yaml.sh acceptance/ci-inputs/kind-inputs.yaml
wilkermichael marked this conversation as resolved.
Show resolved Hide resolved


# ===========> Release Targets

Expand Down
3 changes: 3 additions & 0 deletions acceptance/ci-inputs/kind-inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
kind-version: v0.19.0
kind-node-image: kindest/node:v1.27.1
kubectl-version: v1.27.1
10 changes: 10 additions & 0 deletions control-plane/build-support/scripts/read-yaml-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
input_file=$1
curtbushko marked this conversation as resolved.
Show resolved Hide resolved

# Convert YAML content to JSON as it is easier to deal with
JSON_CONTENTS=$(yq eval '. | tojson' "${input_file}")

echo "${JSON_CONTENTS}"