Skip to content

Commit 34eb0bd

Browse files
Merge pull request #13 from Gradiant/fix-bitnami
update bitnami image tag, bumped version 1.0.5
2 parents fea97f3 + e0e7b22 commit 34eb0bd

17 files changed

+27
-104
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 1.0.4
6+
VERSION ?= 1.0.5
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -227,7 +227,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
227227

228228
## Tool Versions
229229
KUSTOMIZE_VERSION ?= v5.3.0
230-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
230+
CONTROLLER_TOOLS_VERSION ?= v0.16.5
231231
ENVTEST_VERSION ?= release-0.17
232232
GOLANGCI_LINT_VERSION ?= v1.57.2
233233

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ A complete demo with UERANSIM is available at [this link](https://gradiant.githu
110110
5. By default, components use the `ClusterIP` service type. To change the service type, set the `serviceType` field to `LoadBalancer` or `NodePort` in the CR for the desired component. This option is currently available for the `amf-ngap`, `smf-pfcp`, `upf-pfcp`, and `upf-gtpu` services.
111111
6. The `open5gsImage` field in the CR specifies the version of the Open5GS images. If not specified, the operator defaults to version `docker.io/gradiant/open5gs:2.7.5`.
112112
7. The `webuiImage` field in the CR specifies the version of the Open5GS WebUI image. If not specified, the operator defaults to version `docker.io/gradiant/open5gs-webui:2.7.5`.
113-
8. The `mongoDBVersion` field in the CR specifies the version of the MongoDB image. If not specified, the operator defaults to version `bitnami/mongodb:8.0.6-debian-12-r0`.
113+
8. The `mongoDBVersion` field in the CR specifies the version of the MongoDB image. If not specified, the operator defaults to version `bitnami/mongodb:latest`.
114114
9. Components with metric support can generate a `ServiceMonitor` CR to expose metrics to Prometheus. However, ensure that the `ServiceMonitor` CRD is installed in the cluster; otherwise, the operator will encounter an error and fail to create the resource. To create a ServiceMonitor, set the `serviceMonitor` field to `true` in the CR for the desired component.
115115
10. **UPF Deployment Annotations:** The annotations for the UPF Deployment are managed exclusively through the `upf.deploymentAnnotations` field in the CR. Any annotation not present in this field will be automatically reconciled by the operator (added or removed as needed), so manual changes to annotations will not persist unless reflected in the CR.
116116
11. **UPF GTP-U Interface:** The GTP-U network interface used by the UPF is set via the `upf.gtpuDev` field in the CR (e.g., `gtpuDev: "eth0"`). By default, the UPF uses the `eth0` interface.

api/v1/open5gs_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type Open5GSSpec struct {
2727
WebUI Open5GSFunction `json:"webui,omitempty" default:"{\"enabled\":false,\"serviceAccount\":false,\"metrics\":false,\"serviceMonitor\":false}"`
2828
WebUIImage string `json:"webuiImage,omitempty" default:"docker.io/gradiant/open5gs-webui:2.7.5"`
2929
Open5GSImage string `json:"open5gsImage,omitempty" default:"docker.io/gradiant/open5gs:2.7.5"`
30-
MongoDBVersion string `json:"mongoDBVersion,omitempty" default:"bitnami/mongodb:8.0.6-debian-12-r0"`
30+
MongoDBVersion string `json:"mongoDBVersion,omitempty" default:"bitnami/mongodb:latest"`
3131
Configuration Open5GSConfiguration `json:"configuration,omitempty" default:"{\"mcc\":\"999\",\"mnc\":\"70\",\"region\":\"2\",\"set\":\"1\",\"tac\":\"0001\",\"slices\":[]}"`
3232
}
3333

charts/open5gs-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: open5gs-operator
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 1.0.4
6-
appVersion: "1.0.4"
5+
version: 1.0.5
6+
appVersion: "1.0.5"

charts/open5gs-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ controllerManager:
99
- ALL
1010
image:
1111
repository: gradiant/open5gs-operator
12-
tag: 1.0.4
12+
tag: 1.0.5
1313
resources:
1414
requests:
1515
cpu: 100m

config/crd/bases/net.gradiant.org_open5gses.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: open5gses.net.gradiant.org
88
spec:
99
group: net.gradiant.org

config/crd/bases/net.gradiant.org_open5gsusers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: open5gsusers.net.gradiant.org
88
spec:
99
group: net.gradiant.org

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: gradiant/open5gs-operator
8-
newTag: 1.0.4
8+
newTag: 1.0.5

config/rbac/role.yaml

Lines changed: 6 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -4,58 +4,14 @@ kind: ClusterRole
44
metadata:
55
name: manager-role
66
rules:
7-
- apiGroups:
8-
- apps
9-
resources:
10-
- deployments
11-
verbs:
12-
- create
13-
- delete
14-
- get
15-
- list
16-
- patch
17-
- update
18-
- watch
197
- apiGroups:
208
- ""
219
resources:
2210
- configmaps
23-
verbs:
24-
- create
25-
- delete
26-
- get
27-
- list
28-
- patch
29-
- update
30-
- watch
31-
- apiGroups:
32-
- ""
33-
resources:
3411
- persistentvolumeclaims
35-
verbs:
36-
- create
37-
- delete
38-
- get
39-
- list
40-
- patch
41-
- update
42-
- watch
43-
- apiGroups:
44-
- ""
45-
resources:
4612
- persistentvolumes
47-
verbs:
48-
- create
49-
- delete
50-
- get
51-
- list
52-
- patch
53-
- update
54-
- watch
55-
- apiGroups:
56-
- ""
57-
resources:
5813
- serviceaccounts
14+
- services
5915
verbs:
6016
- create
6117
- delete
@@ -65,9 +21,9 @@ rules:
6521
- update
6622
- watch
6723
- apiGroups:
68-
- ""
24+
- apps
6925
resources:
70-
- services
26+
- deployments
7127
verbs:
7228
- create
7329
- delete
@@ -92,6 +48,9 @@ rules:
9248
- net.gradiant.org
9349
resources:
9450
- open5gses
51+
- open5gsusers
52+
- open5gsusers/finalizers
53+
- open5gsusers/status
9554
verbs:
9655
- create
9756
- delete
@@ -114,39 +73,3 @@ rules:
11473
- get
11574
- patch
11675
- update
117-
- apiGroups:
118-
- net.gradiant.org
119-
resources:
120-
- open5gsusers
121-
verbs:
122-
- create
123-
- delete
124-
- get
125-
- list
126-
- patch
127-
- update
128-
- watch
129-
- apiGroups:
130-
- net.gradiant.org
131-
resources:
132-
- open5gsusers/finalizers
133-
verbs:
134-
- create
135-
- delete
136-
- get
137-
- list
138-
- patch
139-
- update
140-
- watch
141-
- apiGroups:
142-
- net.gradiant.org
143-
resources:
144-
- open5gsusers/status
145-
verbs:
146-
- create
147-
- delete
148-
- get
149-
- list
150-
- patch
151-
- update
152-
- watch

config/samples/net_v1_open5gs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
spec:
1010
open5gsImage: "docker.io/gradiant/open5gs:2.7.5"
1111
webuiImage: "docker.io/gradiant/open5gs-webui:2.7.5"
12-
mongoDBVersion: "bitnami/mongodb:8.0.6-debian-12-r0"
12+
mongoDBVersion: "bitnami/mongodb:latest"
1313
amf:
1414
enabled: true
1515
serviceAccount: true

0 commit comments

Comments
 (0)