Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ jobs:
# needs: [lint, error_check, static_check, vet, sec_check, tests]
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 1
- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v6
with:
go-version: 1.23
go-version: 1.25
- run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build .
docker:
name: Docker build and push
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 1
- name: Docker login
uses: azure/docker-login@v1
uses: azure/docker-login@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7}
- name: Docker Hub Description
if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v5
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
name: golangci-lint
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v5
- uses: actions/setup-go@v6
with:
go-version: 1.23
- uses: actions/checkout@v4
go-version: 1.25
- uses: actions/checkout@v6
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v9
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: latest
Expand All @@ -34,15 +34,15 @@ jobs:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 1
- name: Setup Go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version: 1.23
go-version: 1.25
- name: Create cluster using KinD
uses: engineerd/setup-kind@v0.5.0
uses: engineerd/setup-kind@v0
with:
version: "v0.11.1"
- run: |
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/component-generator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 1
token: ${{ secrets.GH_ACCESS_TOKEN }}
ref: "master"
- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v6
with:
go-version: 1.23
go-version: 1.25
- name: Run adapter to create components
run: |
touch log.txt
Expand All @@ -36,8 +36,7 @@ jobs:
done
rm log.txt
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
uses: stefanzweifel/git-auto-commit-action@v7
file_pattern: templates/
commit_user_name: l5io
commit_user_email: ci@layer5.io
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/components-to-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
CopyComponents:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Make components to .md files
run: |
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
done

- name: Pushes folder to main repo
uses: crykn/copy_folder_to_another_repo_action@v1.0.6
uses: crykn/copy_folder_to_another_repo_action@v1
env:
API_TOKEN_GITHUB: ${{ secrets.GH_ACCESS_TOKEN }}
with:
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/e2etests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
adapter_version: ${{ env.version }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Get version of adapter
run: |
if [ ${{ github.event_name }} == "release" ];then
Expand All @@ -40,7 +40,7 @@ jobs:
yq e -i '.services.istio.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml
cat ./.github/install/deploy.yaml
- name: Uploading file
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: patternfile
path: ./.github/install/deploy.yaml
Expand Down Expand Up @@ -78,12 +78,12 @@ jobs:
if [ "${{github.event_name }}" == "release" ];then
echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
repository: meshery/meshery
token: ${{ secrets.GH_ACCESS_TOKEN }}
- name: DownloadJSON
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
name: patternfile
- name: Add commit SHORT_SHA
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
mv test.md $filename.md
rm data.json
- name: Commit
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v7
with:
file_pattern: docs
commit_user_name: l5io
Expand All @@ -134,7 +134,7 @@ jobs:
adapter_version: ${{ env.version }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Get version of adapter
run: |
if [ ${{ github.event_name }} == "release" ];then
Expand All @@ -155,7 +155,7 @@ jobs:
yq e -i '.services.prometheus.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml
cat ./.github/install/deploywithaddons.yaml
- name: Uploading file
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: patternfile-servicemesh-addon
path: ./.github/install/deploywithaddons.yaml
Expand Down Expand Up @@ -193,12 +193,12 @@ jobs:
if [ "${{github.event_name }}" == "release" ];then
echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
repository: meshery/meshery
token: ${{ secrets.GH_ACCESS_TOKEN }}
- name: DownloadJSON
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
name: patternfile-servicemesh-addon
- name: Add commit SHORT_SHA
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
mv test.md $filename.md
rm data.json
- name: Commit
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v7
with:
file_pattern: docs
commit_user_name: l5io
Expand All @@ -251,7 +251,7 @@ jobs:
adapter_version: ${{ env.version }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Get version of adapter
run: |
if [ ${{ github.event_name }} == "release" ];then
Expand All @@ -270,7 +270,7 @@ jobs:
yq e -i '.services.istioinstallation.settings.istioVersion="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithsampleapp.yaml
cat ./.github/install/deploywithsampleapp.yaml
- name: Uploading file
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: patternfile-servicemesh-sample-app
path: ./.github/install/deploywithsampleapp.yaml
Expand Down Expand Up @@ -308,12 +308,12 @@ jobs:
if [ "${{github.event_name }}" == "release" ];then
echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
repository: meshery/meshery
token: ${{ secrets.GH_ACCESS_TOKEN }}
- name: DownloadJSON
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
name: patternfile-servicemesh-sample-app
- name: Add commit SHORT_SHA
Expand Down Expand Up @@ -352,7 +352,7 @@ jobs:
mv test.md $filename.md
rm data.json
- name: Commit
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v7
with:
file_pattern: docs
commit_user_name: l5io
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/error-ref-publisher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ jobs:
if: github.repository == 'meshery/meshery-istio'
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
# token here with write access to meshery-istio repo
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
ref: "master"

- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v6
with:
go-version: 1.23
go-version: 1.25

- name: Run utility
run: |
go run github.com/meshery/meshkit/cmd/errorutil -d . update --skip-dirs meshery -i ./helpers -o ./helpers
# to update errorutil* files in meshkit repo
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v7
with:
commit_user_name: l5io
commit_user_email: ci@meshery.io
Expand All @@ -39,7 +39,7 @@ jobs:

# to push changes to meshery docs
- name: Checkout meshery
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: "meshery/meshery"
# token with write access to meshery repository
Expand All @@ -52,7 +52,7 @@ jobs:
echo '{ "errors_export": "" }' | jq --slurpfile export ./helpers/errorutil_errors_export.json '.errors_export = $export[0]' > ./meshery/docs/_data/errorref/istio_errors_export.json

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v7
with:
repository: ./meshery
commit_user_name: l5io
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label-commenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
comment:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: master # Set your default branch

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Identify Release Values
if: "${{ github.event.inputs.release-ver}} != 'v' }}"
run: |
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: "{{defaultContext}}"
push: true
Expand All @@ -100,7 +100,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
platforms: linux/amd64,linux/arm64
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v5
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
- uses: release-drafter/release-drafter@v6
with:
config-name: release-drafter.yml
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{ github.repository }}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV

- name: Notify Slack
uses: slackapi/slack-github-action@v2.1.1
uses: slackapi/slack-github-action@v2
with:
method: chat.postMessage
token: ${{ secrets.SLACK_BOT_TOKEN }}
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Notify Slack
uses: slackapi/slack-github-action@v2.1.1
uses: slackapi/slack-github-action@v2
with:
method: chat.postMessage
token: ${{ secrets.SLACK_BOT_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG GOLANG_VERSION=1.23
FROM golang:${GOLANG_VERSION} as builder
ARG GOLANG_VERSION=1.25
FROM golang:${GOLANG_VERSION} AS builder

ARG VERSION
ARG GIT_COMMITSHA
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GIT_VERSION = $(shell git describe --tags `git rev-list --tags --max-count=1`)
GIT_COMMITSHA = $(shell git rev-list -1 HEAD)
GIT_STRIPPED_VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1` | cut -c 2-)

GOVERSION = 1.23
GOVERSION = 1.25
GOPATH = $(shell go env GOPATH)
GOBIN = $(GOPATH)/bin

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/layer5io/meshery-istio

go 1.23.4
go 1.25.0

replace (
//github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
Expand Down