Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable certificate ssl #8

Merged
merged 6 commits into from
Jul 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ Minikube cluster (don't forget to remove the dependency)

## Start T-CLO-902 Project

helm install <RELEASE-NAME> waffle-man/t-clo-902
helm install <RELEASE-NAME> waffle-man/t-clo-902 -f values.yml

14 changes: 7 additions & 7 deletions charts/t-clo-902/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ name: t-clo-902
description: A Helm chart to sell cats on Kubernetes
type: application

version: 0.70.0
version: 0.71.0

appVersion: "1.1.0"

dependencies:
- name: ingress-nginx
version: 4.7.0
repository: https://kubernetes.github.io/ingress-nginx
# - name: ingress-nginx
# version: 4.7.0
# repository: https://kubernetes.github.io/ingress-nginx
- name: mysql
version: 9.10.2
repository: https://charts.bitnami.com/bitnami
- name: rabbitmq
version: 12.0.0
repository: https://charts.bitnami.com/bitnami
- name: cert-manager
version: 0.11.5
repository: https://charts.bitnami.com/bitnami
# - name: cert-manager
# version: 1.12.1
# repository: https://charts.jetstack.io
- name: eck-operator
version: 2.8.0
repository: https://helm.elastic.co
Expand Down
4,417 changes: 4,416 additions & 1 deletion charts/t-clo-902/crds/all-es-crds.yaml

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions charts/t-clo-902/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
You've deployed the T-CLO-902 Project !

Get Mysql pass
You've deployed the T-CLO-902 Project !

Mysql user password :
kubectl get secret --namespace default {{ .Release.Name }}-mysql -o jsonpath="{.data.mysql-password}" | base64 -d
Expand Down
26 changes: 13 additions & 13 deletions charts/t-clo-902/templates/certificate.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{{- $releaseName := (printf .Release.Name) }}
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: {{ .Release.Name }}-cert #name of this object
namespace: default #same namespace as
spec:
dnsNames:
- psdc.tech ###NEED A VALID DOMAIN NAME
secretName: kubi-tls-cert
issuerRef:
name: {{ .Release.Name }}letsencrypt-cluster-issuer
kind: ClusterIssuer
# {{- $releaseName := (printf .Release.Name) }}
# apiVersion: cert-manager.io/v1
# kind: Certificate
# metadata:
# name: {{ .Release.Name }}-cert
# namespace: default
# spec:
# dnsNames:
# - psdc.tech
# secretName: kubi-tls
# issuerRef:
# name: {{ .Release.Name }}-letsencrypt-prod
# kind: ClusterIssuer
2 changes: 1 addition & 1 deletion charts/t-clo-902/templates/ingress-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
rules:
- http:
paths:
{{- with .Values.GrafanaIngress }}
{{- with .Values.monitorIngress }}
- path: {{ .path }}(/|$)(.*)
pathType: Prefix
backend:
Expand Down
12 changes: 8 additions & 4 deletions charts/t-clo-902/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ kind: Ingress
metadata:
annotations:
kubernetes.io/ingress.class: nginx
# nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
# nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
# cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod
# certmanager.k8s.io/acme-challenge-type: http01
name: {{ .Release.Name }}-ingress
namespace: default
spec:
tls:
- hosts:
- psdc.tech ##NEED A VALID DOMAIN NAME
secretName: kubi-tls
# tls:
# - hosts:
# - psdc.tech
# secretName: kubi-tls
rules:
- http:
paths:
Expand Down
53 changes: 36 additions & 17 deletions charts/t-clo-902/templates/issuer.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,36 @@
{{- $releaseName := (printf .Release.Name) }}
apiVersion: cert-manager.io/v1
kind: ClusterIssuer
metadata:
name: {{ .Release.Name }}-letsencrypt-cluster-issuer
annotations:
kubernetes.io/ingress.class: nginx
spec:
acme:
server: https://acme-v02.api.letsencrypt.org/directory
email: [email protected]
privateKeySecretRef:
name: letsencrypt-cluster-issuer-key
solvers:
- http01:
ingress:
class: nginx
# {{- $releaseName := (printf .Release.Name) }}
# apiVersion: cert-manager.io/v1
# kind: ClusterIssuer
# metadata:
# name: {{ .Release.Name }}-letsencrypt-staging
# annotations:
# kubernetes.io/ingress.class: nginx
# spec:
# acme:
# server: https://acme-staging-v02.api.letsencrypt.org/directory
# email: [email protected]
# privateKeySecretRef:
# name: letsencrypt-staging-key
# solvers:
# - http01:
# ingress:
# class: nginx
# ---
# apiVersion: cert-manager.io/v1
# kind: ClusterIssuer
# metadata:
# name: {{ .Release.Name }}-letsencrypt-prod
# spec:
# acme:
# # The ACME server URL
# server: https://acme-v02.api.letsencrypt.org/directory
# # Email address used for ACME registration
# email: [email protected]
# # Name of a secret used to store the ACME account private key
# privateKeySecretRef:
# name: letsencrypt-prod-issuer
# # Enable the HTTP-01 challenge provider
# solvers:
# - http01:
# ingress:
# class: nginx
60 changes: 4 additions & 56 deletions charts/t-clo-902/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ global:
auth:
username: kubi
password: password
rootPassword: tamer
rootPassword: rootpassword
database: kubi
connection: mysql

Expand All @@ -36,7 +36,7 @@ mysql:
createDatabase: true
username: kubi
password: password
rootPassword: root
rootPassword: rootpassword
database: kubi
connection: mysql

Expand All @@ -56,16 +56,11 @@ ingressPaths:
port: 6001
svc: back-svc

GrafanaIngress:
path: /grafana
monitorIngress:
path: /monitor
port: 3000
svc: grafana

KibanaIngress:
path: /kibana
port: 5601
svc: kibana

dockerImageCredentials:
registry: https://ghcr.io
username: user
Expand Down Expand Up @@ -132,50 +127,3 @@ grafana:
adminPassword: grafanapassword
dashboardsConfigMaps:
default: "grafana-dashboards"

logstash:
logstash.conf: |
input {
beats {
port => 5044
}
}
output { elasticsearch { hosts => "{{ .Release.Name }}-es-http:9200" } }
service:
annotations: {}
type: ClusterIP
loadBalancerIP: ""
ports:
- name: beats
port: 5044
protocol: TCP
targetPort: 5044
- name: http
port: 8080
protocol: TCP
targetPort: 8080

filebeat:
filebeatConfig:
filebeat.yml: |
filebeat.inputs:
- type: container
paths:
- /var/log/containers/*.log
processors:
- add_kubernetes_metadata:
host: ${NODE_NAME}
matchers:
- logs_path:
logs_path: "/var/log/containers/"

output.logstash:
hosts: ["kubi-logstash:5044"]

kibana:
elasticsearchHosts: http://kubi-es-http:9200
extraEnvs:
- name: ELASTICSEARCH_USERNAME
value: user
- name: ELASTICSEARCH_PASSWORD
value: password
12 changes: 0 additions & 12 deletions release-it.sh

This file was deleted.

18 changes: 9 additions & 9 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ resource "ovh_cloud_project_kube" "my_kube_cluster" {
}

# Create a Node Pool for our Kubernetes cluster
# resource "ovh_cloud_project_kube_nodepool" "node_pool" {
# service_name = var.kube_service_name
# kube_id = ovh_cloud_project_kube.my_kube_cluster.id
# name = "my-pool"
# flavor_name = "b2-7"
# desired_nodes = 1
# max_nodes = 1
# min_nodes = 1
# }
resource "ovh_cloud_project_kube_nodepool" "node_pool" {
service_name = var.kube_service_name
kube_id = ovh_cloud_project_kube.my_kube_cluster.id
name = "my-pool"
flavor_name = "b2-7"
desired_nodes = 1
max_nodes = 1
min_nodes = 1
}
110 changes: 0 additions & 110 deletions terraform/terraform.tfstate.backup

This file was deleted.