Skip to content

Commit 9fd20fe

Browse files
codejshacodejsha
committed
Merge branch 'develop'
2 parents 36dce37 + 0d78f7a commit 9fd20fe

37 files changed

+191
-121
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ __pycache__/
77
venv/
88

99
temp/
10-
temp.*
1110
*-temp.*
1211

1312
nohup.*

‎git/gitea/all.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
3+
set -o errexit
4+
set -o errtrace
5+
6+
export VAULT_ADDR="https://vault.example.com"
7+
export VAULT_TOKEN="$(cat ${HOME}/.vault/root_token.txt)"
8+
export VAULT_CACERT="${HOME}/.vault/ca.crt"
9+
10+
cd helm
11+
./helm-install-gitea.sh
12+
cd ..
13+
14+
kubectl apply --filename gitea-namespace.yaml
15+
16+
cd istio
17+
kubectl apply --filename gitea-traffic-management.yaml
18+
cd ..
19+
20+
cd vault
21+
bash ./create-kubernetes-role.sh
22+
bash ./create-pki-role.sh
23+
kubectl apply --filename issuer-serviceaccount.yaml
24+
bash ./create-issuer.sh
25+
kubectl apply --filename gitea-certificate.yaml
26+
cd ..

‎git/gitea/gitea-namespace.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
apiVersion: v1
3+
kind: Namespace
4+
metadata:
5+
name: gitea
6+
labels:
7+
istio-injection: enabled

‎git/gitea/vault/create-issuer.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
3+
set -o errexit
4+
set -o errtrace
5+
6+
NAMESPACE="gitea"
7+
8+
export GITEA_ISSUER_SECRET_REF="$(kubectl get secrets --namespace ${NAMESPACE} --output=json | jq -r '.items[].metadata | select(.name|startswith("gitea-issuer-secret")).name')"
9+
export BASE64_ENCODED_CABUNDLE="$(kubectl get secrets vault-ha-tls --namespace vault --output jsonpath='{.data.kubernetes-ca\.crt}')"
10+
11+
envsubst < ./issuer.yaml > ./issuer-temp.yaml
12+
kubectl apply --namespace ${NAMESPACE} --filename ./issuer-temp.yaml

‎git/gitea/vault/issuer-serviceaccount.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
apiVersion: v1
3+
kind: ServiceAccount
4+
metadata:
5+
name: gitea-issuer
6+
namespace: gitea
7+
---
8+
apiVersion: v1
9+
kind: Secret
10+
metadata:
11+
name: gitea-issuer-secret
12+
namespace: gitea
13+
annotations:
14+
kubernetes.io/service-account.name: gitea-issuer
15+
type: kubernetes.io/service-account-token

‎git/gitea/vault/vault-issuer.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
apiVersion: cert-manager.io/v1
3+
kind: Issuer
4+
metadata:
5+
name: gitea-issuer
6+
spec:
7+
vault:
8+
server: http://my-vault.vault.svc.cluster.local:8200
9+
path: pki/sign/gitea
10+
auth:
11+
kubernetes:
12+
mountPath: /v1/auth/kubernetes
13+
role: gitea-issuer
14+
secretRef:
15+
name: ${GITEA_ISSUER_SECRET_REF}
16+
key: token

‎istio/addon/install-addon.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
#!/bin/bash
2-
# trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
3-
# set -o errexit
4-
# set -o errtrace
2+
trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
3+
set -o errexit
4+
set -o errtrace
55

6-
cd ../istio-*/
7-
kubectl apply --namespace istio-system --filename samples/addons
6+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/grafana.yaml
7+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/jaeger.yaml
8+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/kiali.yaml
9+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/loki.yaml
10+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/prometheus.yaml
11+
12+
######################################################################
13+
14+
### install
15+
# cd ../istio-*/
16+
# kubectl apply -f samples/addons
817

918
### delete
1019
# cd ../istio-*/
11-
# kubectl delete --filename samples/addons
20+
# kubectl delete -f samples/addons

‎istio/addon/istio/grafana-traffic-management.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: networking.istio.io/v1alpha3
2+
apiVersion: networking.istio.io/v1
33
kind: Gateway
44
metadata:
55
name: grafana-gw
@@ -26,7 +26,7 @@ spec:
2626
credentialName: grafana-cert
2727
mode: SIMPLE
2828
---
29-
apiVersion: networking.istio.io/v1alpha3
29+
apiVersion: networking.istio.io/v1
3030
kind: VirtualService
3131
metadata:
3232
name: grafana-vs
@@ -43,7 +43,7 @@ spec:
4343
port:
4444
number: 3000
4545
---
46-
apiVersion: networking.istio.io/v1alpha3
46+
apiVersion: networking.istio.io/v1
4747
kind: DestinationRule
4848
metadata:
4949
name: grafana-dr

‎istio/addon/istio/jaeger-traffic-management.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: networking.istio.io/v1alpha3
2+
apiVersion: networking.istio.io/v1
33
kind: Gateway
44
metadata:
55
name: jaeger-gw
@@ -26,7 +26,7 @@ spec:
2626
credentialName: jaeger-cert
2727
mode: SIMPLE
2828
---
29-
apiVersion: networking.istio.io/v1alpha3
29+
apiVersion: networking.istio.io/v1
3030
kind: VirtualService
3131
metadata:
3232
name: jaeger-vs
@@ -43,7 +43,7 @@ spec:
4343
port:
4444
number: 80
4545
---
46-
apiVersion: networking.istio.io/v1alpha3
46+
apiVersion: networking.istio.io/v1
4747
kind: DestinationRule
4848
metadata:
4949
name: jaeger-dr

‎istio/addon/istio/kiali-traffic-management.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: networking.istio.io/v1alpha3
2+
apiVersion: networking.istio.io/v1
33
kind: Gateway
44
metadata:
55
name: kiali-gw
@@ -26,7 +26,7 @@ spec:
2626
credentialName: kiali-cert
2727
mode: SIMPLE
2828
---
29-
apiVersion: networking.istio.io/v1alpha3
29+
apiVersion: networking.istio.io/v1
3030
kind: VirtualService
3131
metadata:
3232
name: kiali-vs
@@ -43,7 +43,7 @@ spec:
4343
port:
4444
number: 20001
4545
---
46-
apiVersion: networking.istio.io/v1alpha3
46+
apiVersion: networking.istio.io/v1
4747
kind: DestinationRule
4848
metadata:
4949
name: kiali-dr

0 commit comments

Comments
 (0)