diff --git a/README.md b/README.md index cbd2557..b0d341a 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ docker run \ --name=yaam \ -it \ -v /home/${USER}/.yaam:/opt/yaam/.yaam \ - -p 25213:25213 utrecht/yaam:v0.5.1 + -p 25213:25213 utrecht/yaam:v0.5.2 ``` Once YAAM has been started, configure a project to ensure that artifacts will diff --git a/cmd/yaam/main.go b/cmd/yaam/main.go index ac70c2d..0ccf294 100644 --- a/cmd/yaam/main.go +++ b/cmd/yaam/main.go @@ -5,6 +5,7 @@ import ( "io" "net/http" "os" + "path/filepath" "time" "github.com/030/logging/pkg/logging" @@ -198,7 +199,16 @@ func main() { if logLevelEnv != "" { logLevel = logLevelEnv } - l := logging.Logging{File: "yaam.log", Level: logLevel, Syslog: true} + h, err := project.Home() + if err != nil { + log.Fatal(err) + } + + dir := filepath.Join(h, "logs") + if err := os.MkdirAll(dir, os.ModePerm); err != nil { + log.Fatal(err) + } + l := logging.Logging{File: filepath.Join(dir, "yaam.log"), Level: logLevel, Syslog: true} if _, err := l.Setup(); err != nil { log.Fatal(err) } diff --git a/deployments/k8s-openshift/deploy.yml b/deployments/k8s-openshift/deploy.yml index 9ed91ba..5000cd2 100644 --- a/deployments/k8s-openshift/deploy.yml +++ b/deployments/k8s-openshift/deploy.yml @@ -125,8 +125,8 @@ spec: containers: - name: yaam env: - - name: YAAM_DEBUG - value: 'true' + - name: YAAM_LOG_LEVEL + value: info - name: YAAM_HOST value: yaam.some-domain - name: YAAM_USER @@ -139,7 +139,7 @@ spec: secretKeyRef: name: creds key: pass - image: utrecht/yaam:v0.5.1 + image: utrecht/yaam:v0.5.2 livenessProbe: httpGet: path: /status @@ -163,6 +163,8 @@ spec: mountPath: /opt/yaam/.yaam - name: repositories mountPath: /opt/yaam/.yaam/repositories + - name: logs + mountPath: /opt/yaam/.yaam/logs volumes: - name: conf configMap: @@ -170,6 +172,9 @@ spec: - name: repositories persistentVolumeClaim: claimName: repositories + - name: logs + persistentVolumeClaim: + claimName: logs --- apiVersion: v1 kind: PersistentVolume @@ -182,7 +187,20 @@ spec: capacity: storage: 2Gi hostPath: - path: /repositories/ + path: /opt/yaam/repositories/ +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: logs +spec: + storageClassName: standard + accessModes: + - ReadWriteOnce + capacity: + storage: 2Gi + hostPath: + path: /opt/yaam/logs/ --- apiVersion: v1 kind: PersistentVolumeClaim @@ -190,6 +208,20 @@ metadata: name: repositories spec: volumeName: repositories + storageClassName: standard + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: logs +spec: + volumeName: logs + storageClassName: standard accessModes: - ReadWriteOnce resources: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8863022..e92f8bc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,11 +2,14 @@ ## [Unreleased] + +## [v0.5.2] - 2022-11-18 +### Fix +- [[#53](https://github.com/030/yaam/issues/53)] StorageClassName in PVC required in newer k8s versions. + + ## [v0.5.1] - 2022-11-16 -### Build -- **deps:** Update versions. - ### Fix - Publish code coverage by using v3 action. @@ -61,7 +64,8 @@ ## v0.2.1 - 2022-08-23 -[Unreleased]: https://github.com/030/yaam/compare/v0.5.1...HEAD +[Unreleased]: https://github.com/030/yaam/compare/v0.5.2...HEAD +[v0.5.2]: https://github.com/030/yaam/compare/v0.5.1...v0.5.2 [v0.5.1]: https://github.com/030/yaam/compare/v0.5.0...v0.5.1 [v0.5.0]: https://github.com/030/yaam/compare/v0.4.2...v0.5.0 [v0.4.2]: https://github.com/030/yaam/compare/v0.4.1...v0.4.2