Skip to content

Commit 90ce180

Browse files
committed
Fix release workflows
- Check for dirty repository in release - Fix helm release workflow name - Rename dist dir to manifests as dist is used by goreleaser
1 parent 64091a6 commit 90ce180

File tree

5 files changed

+53
-7
lines changed

5 files changed

+53
-7
lines changed

.github/workflows/docker.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ jobs:
3939
with:
4040
fetch-depth: 0 # It is required for GoReleaser to work properly
4141

42+
- name: Install modules
43+
run: go mod tidy
44+
45+
- name: check git status
46+
run: git --no-pager diff --exit-code
4247
# Set up BuildKit Docker container builder to be able to build
4348
# multi-platform images and export cache
4449
# https://github.com/docker/setup-buildx-action

.github/workflows/helm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release Helm Chart and Carvel package
1+
name: Release Helm Chart
22

33
on:
44
push:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
125125

126126
.PHONY: build-installer
127127
build-installer: manifests ## Generate a consolidated YAML with CRDs and deployment.
128-
mkdir -p dist
129-
$(HELM) template --include-crds netbird-operator helm/netbird-operator > dist/install.yaml
128+
mkdir -p manifests
129+
$(HELM) template --include-crds netbird-operator helm/netbird-operator > manifests/install.yaml
130130

131131
##@ Deployment
132132

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This operator enables easily provisioning NetBird access on kubernetes clusters,
1919

2020
```sh
2121
kubectl create namespace netbird
22-
kubectl apply -n netbird -f https://github.com/netbirdio/kubernetes-operator/releases/latest/dist/install.yaml
22+
kubectl apply -n netbird -f https://github.com/netbirdio/kubernetes-operator/releases/latest/manifests/install.yaml
2323
```
2424

2525
**Using the Helm Chart**
@@ -38,7 +38,7 @@ helm show values netbirdio/netbird-operator
3838
**Using install.yaml**
3939

4040
```sh
41-
kubectl delete -n netbird -f https://github.com/netbirdio/kubernetes-operator/releases/latest/dist/install.yaml
41+
kubectl delete -n netbird -f https://github.com/netbirdio/kubernetes-operator/releases/latest/manifests/install.yaml
4242
kubectl delete namespace netbird
4343
```
4444

dist/install.yaml renamed to manifests/install.yaml

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,41 @@ spec:
7575
status:
7676
description: NBSetupKeyStatus defines the observed state of NBSetupKey.
7777
properties:
78-
ready:
79-
type: boolean
78+
conditions:
79+
items:
80+
description: NBSetupKeyCondition defines a condition in NBSetupKey
81+
status.
82+
properties:
83+
lastProbeTime:
84+
description: Last time we probed the condition.
85+
format: date-time
86+
type: string
87+
lastTransitionTime:
88+
description: Last time the condition transitioned from one status
89+
to another.
90+
format: date-time
91+
type: string
92+
message:
93+
description: Human-readable message indicating details about
94+
last transition.
95+
type: string
96+
reason:
97+
description: Unique, one-word, CamelCase reason for the condition's
98+
last transition.
99+
type: string
100+
status:
101+
description: |-
102+
Status is the status of the condition.
103+
Can be True, False, Unknown.
104+
type: string
105+
type:
106+
description: Type is the type of the condition.
107+
type: string
108+
required:
109+
- status
110+
- type
111+
type: object
112+
type: array
80113
type: object
81114
type: object
82115
served: true
@@ -132,6 +165,14 @@ rules:
132165
- get
133166
- patch
134167
- update
168+
- apiGroups:
169+
- ""
170+
resources:
171+
- pods
172+
verbs:
173+
- get
174+
- list
175+
- watch
135176
- apiGroups:
136177
- ""
137178
resources:

0 commit comments

Comments
 (0)