upgrade to free5GC v3.3.0

controllers/common.go

@@ -20,7 +20,7 @@ const (
 	ConfigMapVersionAnnotation = "workload.nephio.org/configMapVersion"
 
 	// TODO(jbelamaric): Update to use ImageConfig spec.ImagePaths["upf"]
-	AMFImage = "docker.io/nephio/free5gc-amf:3.2.1"
-	SMFImage = "docker.io/nephio/free5gc-smf:3.2.1"
-	UPFImage = "docker.io/nephio/free5gc-upf:3.2.1"
+	AMFImage = "docker.io/nephio/free5gc-amf:3.3.0"
+	SMFImage = "docker.io/nephio/free5gc-smf:3.3.0"
+	UPFImage = "docker.io/nephio/free5gc-upf:3.3.0"
 )

free5gc-images/Makefile

@@ -1,4 +1,4 @@
-FREE5GC_VERSION ?= 3.2.1
+FREE5GC_VERSION ?= 3.3.0
 IMG_REGISTRY ?= docker.io/nephio
 BASE_IMAGE ?= alpine:3.18.0
 BUILDER_IMAGE ?= golang:1.20.5

free5gc-images/free5gc-amf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,15 +8,15 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./log/ ./config/ ./TLS/ ./amf/
+RUN mkdir --parents ./cert/ ./log/ ./config/ ./amf/
 
 # Copy executable and default certs/configs
 COPY --from=builder /free5gc/amf ./amf
-COPY --from=builder /free5gc/config/TLS/amf.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/amf.key ./config/TLS/
+COPY --from=builder /free5gc/cert/amf.pem ./cert/
+COPY --from=builder /free5gc/cert/amf.key ./cert/
 COPY --from=builder /free5gc/config/amfcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/amf

free5gc-images/free5gc-ausf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,15 +8,15 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./log/ ./config/TLS/ ./ausf/
+RUN mkdir --parents ./cert/ ./log/ ./cert/ ./ausf/
 
 # Copy executable and default certs
 COPY --from=builder /free5gc/ausf ./ausf
-COPY --from=builder /free5gc/config/TLS/ausf.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/ausf.key ./config/TLS/
+COPY --from=builder /free5gc/cert/ausf.pem ./cert/
+COPY --from=builder /free5gc/cert/ausf.key ./cert/
 COPY --from=builder /free5gc/config/ausfcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/ausf

free5gc-images/free5gc-base/Dockerfile

@@ -8,7 +8,7 @@ ARG BASE_IMAGE=alpine
 #
 
 FROM $BUILDER_IMAGE AS builder
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ENV VERSION=$VERSION
 
 # Note: "golang" builder image is based on Debian
@@ -34,7 +34,7 @@ FROM $BASE_IMAGE
 
 WORKDIR /free5gc
 
-RUN mkdir --parents ./config/ ./config/TLS/ ./public
+RUN mkdir --parents ./cert/ ./config/ ./cert/ ./public
 
 # Copy executables
 COPY --from=builder /go/src/free5gc/bin/* ./
@@ -45,4 +45,4 @@ COPY --from=builder /go/src/free5gc/webconsole/public ./public
 
 # Copy certificates and config files
 COPY --from=builder /go/src/free5gc/config/* ./config/
-COPY --from=builder /go/src/free5gc/config/TLS/* ./config/TLS/
+COPY --from=builder /go/src/free5gc/cert/* ./cert/

free5gc-images/free5gc-n3iwf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -11,15 +11,15 @@ ENV GIN_MODE="release"
 RUN apk add -U iproute2
 
 WORKDIR /free5gc
-RUN mkdir --parents ./log/ ./config/TLS/ ./n3iwf/
+RUN mkdir --parents ./cert/ ./log/ ./cert/ ./n3iwf/
 
 # Copy executable and default certs/configs
 COPY --from=builder /free5gc/n3iwf ./n3iwf
-COPY --from=builder /free5gc/config/TLS/n3iwf.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/n3iwf.key ./config/TLS/
+COPY --from=builder /free5gc/cert/n3iwf.pem ./cert/
+COPY --from=builder /free5gc/cert/n3iwf.key ./cert/
 COPY --from=builder /free5gc/config/n3iwfcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/n3iwf

free5gc-images/free5gc-nrf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,15 +8,15 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./log/ ./config/TLS/ ./nrf/
+RUN mkdir --parents ./cert/ ./log/ ./cert/ ./nrf/
 
 # Copy executable and default certs
 COPY --from=builder /free5gc/nrf ./nrf
-COPY --from=builder /free5gc/config/TLS/nrf.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/nrf.key ./config/TLS/
+COPY --from=builder /free5gc/cert/nrf.pem ./cert/
+COPY --from=builder /free5gc/cert/nrf.key ./cert/
 COPY --from=builder /free5gc/config/nrfcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/nrf

free5gc-images/free5gc-nssf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,15 +8,15 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./log/ ./config/TLS/ ./nssf/
+RUN mkdir --parents ./cert/ ./log/ ./cert/ ./nssf/
 
 # Copy executable and default certs
 COPY --from=builder /free5gc/nssf ./nssf
-COPY --from=builder /free5gc/config/TLS/nssf.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/nssf.key ./config/TLS/
+COPY --from=builder /free5gc/cert/nssf.pem ./cert/
+COPY --from=builder /free5gc/cert/nssf.key ./cert/
 COPY --from=builder /free5gc/config/nssfcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/nssf

free5gc-images/free5gc-pcf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,15 +8,15 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./config/ ./log/ ./config/TLS/ ./pcf/
+RUN mkdir --parents ./cert/ ./config/ ./log/ ./cert/ ./pcf/
 
 # Copy executable and default certs
 COPY --from=builder /free5gc/pcf ./pcf
-COPY --from=builder /free5gc/config/TLS/pcf.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/pcf.key ./config/TLS/
+COPY --from=builder /free5gc/cert/pcf.pem ./cert/
+COPY --from=builder /free5gc/cert/pcf.key ./cert/
 COPY --from=builder /free5gc/config/pcfcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/pcf

free5gc-images/free5gc-smf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,16 +8,16 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./log/ ./config/TLS/ ./smf/
+RUN mkdir --parents ./cert/ ./log/ ./cert/ ./smf/
 
 # Copy executable and default certs
 COPY --from=builder /free5gc/smf ./smf
-COPY --from=builder /free5gc/config/TLS/smf.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/smf.key ./config/TLS/
+COPY --from=builder /free5gc/cert/smf.pem ./cert/
+COPY --from=builder /free5gc/cert/smf.key ./cert/
 COPY --from=builder /free5gc/config/smfcfg.yaml ./config/
 COPY --from=builder /free5gc/config/uerouting.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/smf

free5gc-images/free5gc-udm/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,15 +8,15 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./log/ ./config/TLS/ ./udm/
+RUN mkdir --parents ./cert/ ./log/ ./cert/ ./udm/
 
 # Copy executable and default certs
 COPY --from=builder /free5gc/udm ./udm
-COPY --from=builder /free5gc/config/TLS/udm.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/udm.key ./config/TLS/
+COPY --from=builder /free5gc/cert/udm.pem ./cert/
+COPY --from=builder /free5gc/cert/udm.key ./cert/
 COPY --from=builder /free5gc/config/udmcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/udm

free5gc-images/free5gc-udr/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -8,15 +8,15 @@ FROM $BASE_IMAGE
 ENV GIN_MODE="release"
 
 WORKDIR /free5gc
-RUN mkdir --parents ./config/ ./log/ ./config/TLS/ ./udr/
+RUN mkdir --parents ./cert/ ./config/ ./log/ ./cert/ ./udr/
 
 # Copy executable and default certs
 COPY --from=builder /free5gc/udr ./udr
-COPY --from=builder /free5gc/config/TLS/udr.pem ./config/TLS/
-COPY --from=builder /free5gc/config/TLS/udr.key ./config/TLS/
+COPY --from=builder /free5gc/cert/udr.pem ./cert/
+COPY --from=builder /free5gc/cert/udr.key ./cert/
 COPY --from=builder /free5gc/config/udrcfg.yaml ./config/
 
 VOLUME [ "/free5gc/config" ]
-#VOLUME [ "/free5gc/config/TLS" ]
+
 
 WORKDIR /free5gc/udr

free5gc-images/free5gc-upf/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -11,7 +11,7 @@ ENV GIN_MODE="release"
 RUN apk --no-cache add iproute2 iptables
 
 WORKDIR /free5gc
-RUN mkdir --parents ./config/ ./upf/
+RUN mkdir --parents ./cert/ ./config/ ./upf/
 
 # Copy executable and default configs/certs
 COPY --from=builder /free5gc/upf ./upf/

free5gc-images/free5gc-webconsole/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.2.1
+ARG VERSION=3.3.0
 ARG REGISTRY=docker.io/nephio
 ARG BASE_IMAGE=alpine
 
@@ -10,7 +10,7 @@ ENV GIN_MODE="release"
 RUN apk --no-cache add libc6-compat
 
 WORKDIR /free5gc
-RUN mkdir --parents ./config/ ./webconsole/public
+RUN mkdir --parents ./cert/ ./config/ ./webconsole/public
 
 # Copy executable and default configs/statics
 COPY --from=builder /free5gc/webconsole ./webconsole/