mirror of
https://github.com/k8snetworkplumbingwg/multus-cni.git
synced 2025-09-09 12:51:39 +00:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
77aac95dfc | ||
|
72945e3679 |
10
.github/workflows/image-push-master.yml
vendored
10
.github/workflows/image-push-master.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
|||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
@@ -25,7 +25,7 @@ jobs:
|
|||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Push container image for thick plugin
|
- name: Push container image for thick plugin
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
@@ -55,7 +55,7 @@ jobs:
|
|||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Push thin container image
|
- name: Push thin container image
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@@ -69,7 +69,7 @@ jobs:
|
|||||||
provenance: false
|
provenance: false
|
||||||
|
|
||||||
- name: Push thin container debug image
|
- name: Push thin container debug image
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
|
10
.github/workflows/image-push-release.yml
vendored
10
.github/workflows/image-push-release.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
|||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
@@ -33,7 +33,7 @@ jobs:
|
|||||||
latest=false
|
latest=false
|
||||||
|
|
||||||
- name: Push container image for thick plugin
|
- name: Push container image for thick plugin
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@@ -55,7 +55,7 @@ jobs:
|
|||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
@@ -71,7 +71,7 @@ jobs:
|
|||||||
latest=false
|
latest=false
|
||||||
|
|
||||||
- name: Push thin container image
|
- name: Push thin container image
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@@ -85,7 +85,7 @@ jobs:
|
|||||||
provenance: false
|
provenance: false
|
||||||
|
|
||||||
- name: Push thin container debug image
|
- name: Push thin container debug image
|
||||||
if: github.repository_owner == ${{ env.image-push-owner }}
|
if: ${{ github.repository_owner == env.image-push-owner }}
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
|
@@ -292,6 +292,11 @@ func getKubernetesDelegate(client *ClientInfo, net *types.NetworkSelectionElemen
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// acquire lock to access file
|
||||||
|
if types.ChrootMutex != nil {
|
||||||
|
types.ChrootMutex.Lock()
|
||||||
|
defer types.ChrootMutex.Unlock()
|
||||||
|
}
|
||||||
configBytes, err := netutils.GetCNIConfig(customResource, confdir)
|
configBytes, err := netutils.GetCNIConfig(customResource, confdir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, resourceMap, err
|
return nil, resourceMap, err
|
||||||
|
Reference in New Issue
Block a user