Skip to content

Commit 8edb603

Browse files
committed
Consider kubebuilder version
1 parent 07fc210 commit 8edb603

File tree

2 files changed

+51
-33
lines changed

2 files changed

+51
-33
lines changed

.github/workflows/pull_request.yaml

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,64 @@ jobs:
1212
- name: Checkout
1313
uses: actions/checkout@v2
1414

15-
- name: Lint
16-
uses: golangci/golangci-lint-action@v2
17-
with:
18-
version: v1.32.2
19-
args: --timeout=5m
15+
# - name: Lint
16+
# uses: golangci/golangci-lint-action@v2
17+
# with:
18+
# version: v1.32.2
19+
# args: --timeout=5m
2020

21-
- name: Check etcd Cache
22-
id: check-etcd-cache
21+
- name: Ensure etcd
22+
id: Ensure-etcd
2323
uses: actions/cache@v2
2424
with:
2525
path: ~/go/bin/etcd
2626
key: etcd
2727

28-
- name: Check kube-apiserver Cache
29-
id: check-kube-apiserver-cache
28+
- name: Ensure kube-apiserver
29+
id: ensure-kube-apiserver
3030
uses: actions/cache@v2
3131
with:
3232
path: ~/go/bin/kube-apiserver
3333
key: kube-apiserver
3434

35+
- name: Get Kubebuilder Version
36+
id: get-kubebuilder-version
37+
run: echo "::set-output name=version::$(make kubebuilder-version-ci)"
38+
shell: bash
39+
40+
- name: Ensure Kubebuilder Metadata
41+
id: ensure-kubebuilder-metadata
42+
uses: actions/cache@v2
43+
with:
44+
path: ~/.kubebuilder/${{ steps.get-kubebuilder-version.outputs.version }}
45+
key: kubebuilder
46+
3547
- name: Install Kubebuilder
36-
if: ${{ steps.check-etcd-cache.outputs.cache-hit != 'true' || steps.check-kube-apiserver-cache.outputs.cache-hit != 'true' }}
3748
run: make kubebuilder
3849

3950
- name: Run tests
4051
run: make test
4152

42-
- name: Figure out if running fork PR
43-
id: fork
44-
run: '["${{ secrets.DOCKER_REGISTRY_TOKEN }}" == ""] && echo "::set-output name=is_fork_pr::true" || echo "::set-output name=is_fork_pr::false"'
53+
# - name: Figure out if running fork PR
54+
# id: fork
55+
# run: '["${{ secrets.DOCKER_REGISTRY_TOKEN }}" == ""] && echo "::set-output name=is_fork_pr::true" || echo "::set-output name=is_fork_pr::false"'
4556

46-
- name: Docker Login
47-
uses: docker/login-action@v1
48-
with:
49-
registry: ${{ secrets.DOCKER_REGISTRY }}
50-
username: ${{ secrets.DOCKER_REGISTRY_USER }}
51-
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
52-
if: steps.fork.outputs.is_fork_pr == 'false'
57+
# - name: Docker Login
58+
# uses: docker/login-action@v1
59+
# with:
60+
# registry: ${{ secrets.DOCKER_REGISTRY }}
61+
# username: ${{ secrets.DOCKER_REGISTRY_USER }}
62+
# password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
63+
# if: steps.fork.outputs.is_fork_pr == 'false'
5364

54-
- name: Build Docker image
55-
run: |
56-
export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
57-
make docker-build
65+
# - name: Build Docker image
66+
# run: |
67+
# export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
68+
# make docker-build
5869

59-
- name: Push Docker image
60-
run: |
61-
# pull request images are prefixed with 'pr' to prevent them from overriding released images
62-
export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
63-
make docker-push
64-
if: steps.fork.outputs.is_fork_pr == 'false'
70+
# - name: Push Docker image
71+
# run: |
72+
# # pull request images are prefixed with 'pr' to prevent them from overriding released images
73+
# export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
74+
# make docker-push
75+
# if: steps.fork.outputs.is_fork_pr == 'false'

Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,18 @@ install-configmap-sidecars:
184184
crd-cwnp-for-testing:
185185
curl https://raw.githubusercontent.com/metal-stack/firewall-controller/master/config/crd/bases/metal-stack.io_clusterwidenetworkpolicies.yaml -o external/test/crd-clusterwidenetworkpolicy.yaml
186186

187+
KUBEBUILDER_VERSION:=2.3.2
187188
kubebuilder:
189+
echo $(wildcard ~/.kubebuilder/${KUBEBUILDER_VERSION})
190+
ifeq (,$(wildcard ~/.kubebuilder/${KUBEBUILDER_VERSION}))
188191
{ \
189192
os=$$(go env GOOS) ;\
190193
arch=$$(go env GOARCH) ;\
191-
curl -L https://go.kubebuilder.io/dl/2.3.1/$${os}/$${arch} | tar -xz -C /tmp/ ;\
192-
mv /tmp/kubebuilder_2.3.1_$${os}_$${arch}/bin/* ${GOBIN} ;\
194+
curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERSION}/$${os}/$${arch} | tar -xz -C /tmp/ ;\
195+
mv /tmp/kubebuilder_${KUBEBUILDER_VERSION}_$${os}_$${arch}/bin/* ${GOBIN} ;\
196+
mkdir -p ~/.kubebuilder/${KUBEBUILDER_VERSION} ;\
193197
}
194-
198+
endif
199+
200+
kubebuilder-version-ci:
201+
@echo ${KUBEBUILDER_VERSION}

0 commit comments

Comments
 (0)