From 525d06a715ab4307d51a2a8ec79de9037d363b9e Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 24 Jun 2024 21:56:20 +1000 Subject: [PATCH 1/6] fix sonarqube namespace --- kubernetes/apps/sonarqube/sonarqube.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/apps/sonarqube/sonarqube.yaml b/kubernetes/apps/sonarqube/sonarqube.yaml index 7f8ee63..85d01c1 100644 --- a/kubernetes/apps/sonarqube/sonarqube.yaml +++ b/kubernetes/apps/sonarqube/sonarqube.yaml @@ -39,7 +39,7 @@ spec: name: flux-system dependsOn: - name: sonarqube-secrets - namespace: redis + namespace: sonarqube postBuild: substituteFrom: - kind: Secret From 69bb362d57c34a6e040f0a16b863a232a0ac076f Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 24 Jun 2024 22:02:56 +1000 Subject: [PATCH 2/6] add sonarqube volume --- kubernetes/apps/sonarqube/app/release.yaml | 9 ++++- kubernetes/apps/sonarqube/app/volume.yaml | 46 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 kubernetes/apps/sonarqube/app/volume.yaml diff --git a/kubernetes/apps/sonarqube/app/release.yaml b/kubernetes/apps/sonarqube/app/release.yaml index b2f5a4c..5f47249 100644 --- a/kubernetes/apps/sonarqube/app/release.yaml +++ b/kubernetes/apps/sonarqube/app/release.yaml @@ -22,11 +22,18 @@ spec: smtpUser: ${smtp_user} smtpPassword: ${smtp_password} smtpProtocol: ${smtp_protocol} + service: + ports: + http: 8090 + elastic: 9091 + nodePorts: + http: 30080 + elastic: 30091 persistence: enabled: true storageClass: "local-path" size: "32Gi" - existingClaim: "" + existingClaim: "sonarqube-pvc" postgresql: enabled: false externalDatabase: diff --git a/kubernetes/apps/sonarqube/app/volume.yaml b/kubernetes/apps/sonarqube/app/volume.yaml new file mode 100644 index 0000000..d6f625d --- /dev/null +++ b/kubernetes/apps/sonarqube/app/volume.yaml @@ -0,0 +1,46 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: sonarqube-pv + namespace: sonarqube + labels: + type: local +spec: + storageClassName: local-path + volumeMode: Filesystem + capacity: + storage: 32Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + local: + path: "/mnt/nfs/AppData/sonarqube" + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: sonarqube-pvc + namespace: sonarqube + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - rpi5-cluster-node-3 +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: sonarqube-pvc + namespace: sonarqube + labels: + name: sonarqube-pvc +spec: + storageClassName: local-path + volumeMode: Filesystem + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 32Gi \ No newline at end of file From fa832ef64d592e9cf60ecbc51307664e4f49e248 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 24 Jun 2024 22:04:15 +1000 Subject: [PATCH 3/6] add sonarqube ingress --- kubernetes/apps/sonarqube/app/ingress.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kubernetes/apps/sonarqube/app/ingress.yaml b/kubernetes/apps/sonarqube/app/ingress.yaml index f7404ba..28e5b94 100644 --- a/kubernetes/apps/sonarqube/app/ingress.yaml +++ b/kubernetes/apps/sonarqube/app/ingress.yaml @@ -18,4 +18,14 @@ spec: service: name: sonarqube port: - number: 80 \ No newline at end of file + number: 30080 + - host: "elastic.sonarqube.cluster.edward.sydney" + http: + paths: + - pathType: Prefix + path: "/" + backend: + service: + name: sonarqube + port: + number: 30091 \ No newline at end of file From 86f43d20bef6fdfff588940adfa969403457456c Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 24 Jun 2024 22:05:56 +1000 Subject: [PATCH 4/6] delete sonarqube ingress --- kubernetes/apps/sonarqube/app/ingress.yaml | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 kubernetes/apps/sonarqube/app/ingress.yaml diff --git a/kubernetes/apps/sonarqube/app/ingress.yaml b/kubernetes/apps/sonarqube/app/ingress.yaml deleted file mode 100644 index 28e5b94..0000000 --- a/kubernetes/apps/sonarqube/app/ingress.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: sonarqube-ingress - namespace: sonarqube - annotations: - nginx.ingress.kubernetes.io/ssl-redirect: "false" - nginx.ingress.kubernetes.io/use-regex: "true" -spec: - ingressClassName: nginx - rules: - - host: "sonarqube.cluster.edward.sydney" - http: - paths: - - pathType: Prefix - path: "/" - backend: - service: - name: sonarqube - port: - number: 30080 - - host: "elastic.sonarqube.cluster.edward.sydney" - http: - paths: - - pathType: Prefix - path: "/" - backend: - service: - name: sonarqube - port: - number: 30091 \ No newline at end of file From 4628a78f54dce60f52e58c5e32e3743025c16607 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 24 Jun 2024 23:04:39 +1000 Subject: [PATCH 5/6] fix sonarqube namespace --- kubernetes/apps/sonarqube/sonarqube.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/apps/sonarqube/sonarqube.yaml b/kubernetes/apps/sonarqube/sonarqube.yaml index 85d01c1..0fd057c 100644 --- a/kubernetes/apps/sonarqube/sonarqube.yaml +++ b/kubernetes/apps/sonarqube/sonarqube.yaml @@ -7,7 +7,7 @@ spec: interval: 10m timeout: 1m30s retryInterval: 30s - targetNamespace: redis + targetNamespace: sonarqube path: ./sonarqube prune: true sourceRef: From 516168d3e53f00970f4ffe91ea3ca676e9ea59dd Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Tue, 25 Jun 2024 01:02:18 +1000 Subject: [PATCH 6/6] fix sonarqube user --- kubernetes/apps/sonarqube/app/release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubernetes/apps/sonarqube/app/release.yaml b/kubernetes/apps/sonarqube/app/release.yaml index 5f47249..6b2364d 100644 --- a/kubernetes/apps/sonarqube/app/release.yaml +++ b/kubernetes/apps/sonarqube/app/release.yaml @@ -17,6 +17,9 @@ spec: remediation: retries: 3 values: + sonarqubeUsername: ${sonarqube_username} + sonarqubePassword: ${sonarqube_password} + sonarqubeEmail: ${sonarqube_email} smtpHost: ${smtp_host} smtpPort: ${smtp_port} smtpUser: ${smtp_user}