Skip to content

Commit

Permalink
Syncing with remote
Browse files Browse the repository at this point in the history
Included commits:
- chore: bump actions/setup-go from 4 to 5 (virtual-kubelet#585)
- chore: bump azure/login from 1.5.0 to 1.5.1 (virtual-kubelet#584)
- ci: Fix e2e pipelines (virtual-kubelet#592)
- fix: security fix 11 & vk upgrade to v1.11.0 (virtual-kubelet#590)
- chore: bump azure/login from 1.5.1 to 1.6.1 (virtual-kubelet#593)
- feat: Update ACI regions (virtual-kubelet#589)
- chore: updating permissions for workflow files (virtual-kubelet#594)
- fix: dependabot workflow config file (virtual-kubelet#595)
- ci: Remove duplicate content permission (virtual-kubelet#596)
- release: update manifest and helm charts for v1.6.1 (virtual-kubelet#597)
- chore: Add Smriti to the owners list (virtual-kubelet#608)

chore: bump azure/login from 1.5.0 to 1.5.1 (virtual-kubelet#584)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

ci: Fix e2e pipelines (virtual-kubelet#592)

Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>

fix: security fix 11 & vk upgrade to v1.11.0 (virtual-kubelet#590)

Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>
Co-authored-by: Heba <31887807+helayoty@users.noreply.github.com>

chore: bump azure/login from 1.5.1 to 1.6.1 (virtual-kubelet#593)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

feat: Update ACI regions (virtual-kubelet#589)

Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>

chore: updating permissions for workflow files (virtual-kubelet#594)

fix: dependabot workflow config file (virtual-kubelet#595)

ci: Remove duplicate content permission (virtual-kubelet#596)

release: update manifest and helm charts for v1.6.1 (virtual-kubelet#597)

Co-authored-by: smritidahal653 <smritidahal653@users.noreply.github.com>

chore: Add Smriti to the owners list (virtual-kubelet#608)

Signed-off-by: Heba <31887807+helayoty@users.noreply.github.com>
  • Loading branch information
dependabot[bot] authored and ksayid committed May 24, 2024
1 parent af520c5 commit b941bf1
Show file tree
Hide file tree
Showing 20 changed files with 251 additions and 250 deletions.
60 changes: 22 additions & 38 deletions .github/workflows/aks-addon-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,24 @@ on:
branches: [master]
paths-ignore: ['docs/**', '**.md', '**.mdx', '**.png', '**.jpg']

permissions:
id-token: write
contents: read

env:
REGISTRY: ghcr.io
# Common versions
GO_VERSION: '1.20'
GO_VERSION: '1.20' # Common versions
E2E_IMG_TAG: 'e2e-ci'

jobs:
export-registry:
runs-on: ubuntu-20.04
outputs:
registry: ${{ steps.export.outputs.registry }}
steps:
- id: export
run: |
# registry must be in lowercase
echo "::set-output name=registry::$(echo "${{ env.REGISTRY }}/${{ github.repository }}" | tr [:upper:] [:lower:])"
permissions:
id-token: write # This is required for requesting the JWT
contents: read # This is required for actions/checkout
actions: read #This is required for reading environment variables
deployments: read #This is required for reading deployment status

jobs:
aks-addon-e2e-tests:
needs: export-registry
environment: test
env:
REGISTRY: ${{ needs.export-registry.outputs.registry }}
E2E_IMG_TAG: "e2e-ci"
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Set up Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

Expand All @@ -51,30 +39,26 @@ jobs:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}

- name: Shorten SHA
id: vars
run: echo "::set-output name=pr_sha_short::$(git rev-parse --short ${{ github.event.pull_request.head.sha }} )"
- name: Get Repo
run: |
echo "REGISTRY=$(echo "${{ env.REGISTRY }}/${{ github.repository }}" | tr [:upper:] [:lower:])" >> $GITHUB_ENV
- name: Set e2e Cluster Name
run: |
rand=${{ steps.vars.outputs.pr_sha_short }}
echo "pr_sha_short=$(git rev-parse --short ${{ github.event.pull_request.head.sha }} )" >> $GITHUB_ENV
rand=${{ env.pr_sha_short }}
if [ "$rand" = "" ]; then
rand=$RANDOM
fi
echo "CLUSTER_NAME=aks-addon-vk-test${rand}" >> $GITHUB_ENV
- name: Install Azure CLI latest
run: |
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
az version
- uses: azure/login@v1.5.0
- uses: azure/login@v1.6.1
with:
client-id: ${{ secrets.CLIENTID }}
tenant-id: ${{ secrets.TENANT_ID }}
subscription-id: ${{ secrets.SUBSCRIPTIONID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Run e2e test
run: |
Expand All @@ -85,10 +69,10 @@ jobs:
CLUSTER_NAME: ${{ env.CLUSTER_NAME }}
VERSION: ${{ env.E2E_IMG_TAG}}
E2E_TARGET: "pr"
PR_COMMIT_SHA: ${{ steps.vars.outputs.pr_sha_short }}
PR_COMMIT_SHA: ${{ env.pr_sha_short }}

- name: Cleanup e2e resources
if: ${{ always() }}
run: |
set +e
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
4 changes: 3 additions & 1 deletion .github/workflows/chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ on:

permissions:
contents: write

actions: read
deployments: read

jobs:
publish-helm-chart:
if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'update manifest and helm charts')
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/create-release-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:
permissions:
contents: write
pull-requests: write
actions: read
deployments: read

jobs:
create-release-pull-request:
Expand All @@ -28,7 +30,7 @@ jobs:
submodules: true
fetch-depth: 0
ref: "${{ github.event.inputs.based_on_branch }}"
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20"
- name: update release manifest
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ on:
permissions:
contents: write
packages: write

actions: read
deployments: read
pull-requests: read

env:
REGISTRY: ghcr.io
Expand All @@ -25,7 +27,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Set up Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
- name: Checkout
Expand Down
59 changes: 21 additions & 38 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ concurrency:
cancel-in-progress: true

on:
workflow_dispatch:
pull_request_target:
branches:
- master
Expand All @@ -15,36 +14,24 @@ on:
- '.github/workflows/chart.yml'
- 'charts/**'

permissions:
id-token: write
contents: read

env:
REGISTRY: ghcr.io
# Common versions
GO_VERSION: '1.20'
GO_VERSION: '1.20' # Common versions
E2E_IMG_TAG: "e2e-ci"

jobs:
export-registry:
runs-on: ubuntu-20.04
outputs:
registry: ${{ steps.export.outputs.registry }}
steps:
- id: export
run: |
# registry must be in lowercase
echo "::set-output name=registry::$(echo "${{ env.REGISTRY }}/${{ github.repository }}" | tr [:upper:] [:lower:])"
permissions:
id-token: write
contents: read
actions: read
deployments: read

jobs:
e2e-tests:
needs: export-registry
environment: test
env:
REGISTRY: ${{ needs.export-registry.outputs.registry }}
E2E_IMG_TAG: "e2e-ci"
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Set up Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

Expand All @@ -54,30 +41,26 @@ jobs:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}

- name: Shorten SHA
id: vars
run: echo "::set-output name=pr_sha_short::$(git rev-parse --short ${{ github.event.pull_request.head.sha }} )"
- name: Get Repo
run: |
echo "REGISTRY=$(echo "${{ env.REGISTRY }}/${{ github.repository }}" | tr [:upper:] [:lower:])" >> $GITHUB_ENV
- name: Set e2e Cluster Name
run: |
rand=${{ steps.vars.outputs.pr_sha_short }}
echo "pr_sha_short=$(git rev-parse --short ${{ github.event.pull_request.head.sha }} )" >> $GITHUB_ENV
rand=${{ env.pr_sha_short }}
if [ "$rand" = "" ]; then
rand=$RANDOM
fi
echo "CLUSTER_NAME=vk-aci-test${rand}" >> $GITHUB_ENV
- name: Install Azure CLI latest
run: |
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
az version
- uses: azure/login@v1.5.0
- uses: azure/login@v1.6.1
with:
client-id: ${{ secrets.CLIENTID }}
tenant-id: ${{ secrets.TENANT_ID }}
subscription-id: ${{ secrets.SUBSCRIPTIONID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Run e2e test
run: |
Expand All @@ -94,4 +77,4 @@ jobs:
if: ${{ always() }}
run: |
set +e
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Set up Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/markdown-link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ on:
- '**.md'
- 'docs/**'

permissions:
contents: read
actions: read
deployments: read

jobs:
markdown-link-check:
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pr-title-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
- labeled
- unlabeled

permissions:
contents: read
actions: read
deployments: read

jobs:
check:
runs-on: ubuntu-latest
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ env:
# Common versions
GO_VERSION: '1.20'

permissions:
pull-requests: write
contents: read
actions: read
deployments: read

jobs:
unit-tests:
runs-on: ubuntu-20.04
environment: test
steps:
- name: Set up Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Ref: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners

* @Fei-Guo @helayoty
* @Fei-Guo @helayoty @smritidahal653
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ TEST_CREDENTIALS_JSON ?= $(TEST_CREDENTIALS_DIR)/credentials.json
TEST_LOGANALYTICS_JSON ?= $(TEST_CREDENTIALS_DIR)/loganalytics.json
export TEST_CREDENTIALS_JSON TEST_LOGANALYTICS_JSON TEST_AKS_CREDENTIALS_JSON

VERSION ?= v1.6.0
VERSION ?= v1.6.1
REGISTRY ?= ghcr.io
IMG_NAME ?= virtual-kubelet
INIT_IMG_NAME ?= init-validation
Expand Down Expand Up @@ -105,15 +105,15 @@ e2e-test:
IMG_URL=$(REGISTRY) IMG_REPO=$(IMG_NAME) IMG_TAG=$(IMG_TAG) \
INIT_IMG_REPO=$(INIT_IMG_NAME) INIT_IMG_TAG=$(INIT_IMG_TAG) \
LOCATION=$(LOCATION) RESOURCE_GROUP=$(E2E_CLUSTER_NAME) \
$(AKS_E2E_SCRIPT) go test -timeout 60m -v ./e2e
$(AKS_E2E_SCRIPT) go test -timeout 90m -v ./e2e

.PHONY: aks-addon-e2e-test
aks-addon-e2e-test:
PR_RAND=$(PR_COMMIT_SHA) E2E_TARGET=$(E2E_TARGET) \
IMG_URL=$(REGISTRY) IMG_REPO=$(IMG_NAME) IMG_TAG=$(IMG_TAG) \
INIT_IMG_REPO=$(INIT_IMG_NAME) INIT_IMG_TAG=$(INIT_IMG_TAG) \
LOCATION=$(LOCATION) RESOURCE_GROUP=$(E2E_CLUSTER_NAME) \
$(AKS_ADDON_E2E_SCRIPT) go test -timeout 60m -v ./e2e
$(AKS_ADDON_E2E_SCRIPT) go test -timeout 90m -v ./e2e

.PHONY: vet
vet:
Expand Down
2 changes: 1 addition & 1 deletion charts/virtual-kubelet/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ maintainers:
name: virtual-kubelet-azure-aci
sources:
- https://github.com/virtual-kubelet/azure-aci
version: 1.6.0
version: 1.6.1

2 changes: 1 addition & 1 deletion charts/virtual-kubelet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $ cd helm
2. Install chart using Helm v3.0+

```shell
$ export RELEASE_TAG=1.6.0
$ export RELEASE_TAG=1.6.1
$ export CHART_NAME=virtual-kubelet-azure-aci
$ export VK_RELEASE=$CHART_NAME-$RELEASE_TAG
$ export NODE_NAME=virtual-kubelet-aci
Expand Down
2 changes: 1 addition & 1 deletion charts/virtual-kubelet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ image:
secretName: virtual-kubelet-aci-acr
repository: mcr.microsoft.com
name: oss/virtual-kubelet/virtual-kubelet
tag: 1.6.0
tag: 1.6.1
pullPolicy: Always

initImage:
Expand Down
4 changes: 2 additions & 2 deletions cmd/virtual-kubelet/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,11 @@ func main() {
node, err := nodeutil.NewNode(nodeName,
func(cfg nodeutil.ProviderConfig) (nodeutil.Provider, node.NodeProvider, error) {
if port := os.Getenv("KUBELET_PORT"); port != "" {
var err error
listenPort, err = strconv.Atoi(port)
kubeletPort, err := strconv.ParseInt(port, 10, 32)
if err != nil {
return nil, nil, err
}
listenPort = int(kubeletPort)
}
p, err := azproviderv2.NewACIProvider(ctx, cfgPath, azConfig, azACIAPIs, cfg,
nodeName, operatingSystem, os.Getenv("VKUBELET_POD_IP"),
Expand Down
2 changes: 1 addition & 1 deletion docs/UPGRADE-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Install [Helm](https://helm.sh/docs/intro/quickstart/#install-helm)
### Clone the project

```shell
$ export RELEASE_TAG=1.6.0
$ export RELEASE_TAG=1.6.1
$ git clone https://github.com/virtual-kubelet/azure-aci.git
$ cd azure-aci
$ git checkout v$RELEASE_TAG
Expand Down
2 changes: 1 addition & 1 deletion e2e/volume_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestPodWithMultiVolume(t *testing.T) {
}
t.Log("success create pod with multi-volume")

cmd = kubectl("exec", "pod/vk-e2e-volume", "--namespace=vk-test", "--", "ls /var/run/secrets/kubernetes.io/serviceaccount")
cmd = kubectl("exec", "pod/vk-e2e-volume", "-c", "hpa-example", "--namespace=vk-test", "--", "ls /var/run/secrets/kubernetes.io/serviceaccount")
out, err := cmd.CombinedOutput()
if err != nil {
t.Fatal(string(out))
Expand Down
Loading

0 comments on commit b941bf1

Please sign in to comment.