Skip to content

Commit 65c38b8

Browse files
jamesongithubjamesongithub
committed
rename template functions
1 parent c7259e9 commit 65c38b8

File tree

8 files changed

+64
-55
lines changed

8 files changed

+64
-55
lines changed

‎linux/rancher/Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.PHONY: lint dry-run
2+
3+
lint:
4+
helm lint --values ./values.test.yaml
5+
6+
template:
7+
helm template --values ./values.test.yaml . --debug

‎linux/rancher/readme.md‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ After a few minutes this should deploy the SQL Server containers and you can see
6868
<br/>
6969

7070
```bash
71-
D:\helm-charts\sql-statefull-deploy>kubectl get all
71+
D:\helm-charts\sql-server-rancher>kubectl get all
7272
```
7373

7474
The output should look as shown below:
@@ -77,15 +77,15 @@ The output should look as shown below:
7777

7878
```bash
7979
NAME READY STATUS RESTARTS AGE
80-
pod/mssql-sql-statefull-deploy-0 1/1 Running 0 12m
81-
pod/mssql-sql-statefull-deploy-1 1/1 Running 0 12m
82-
pod/mssql-sql-statefull-deploy-2 1/1 Running 0 12m
80+
pod/mssql-sql-server-rancher-0 1/1 Running 0 12m
81+
pod/mssql-sql-server-rancher-1 1/1 Running 0 12m
82+
pod/mssql-sql-server-rancher-2 1/1 Running 0 12m
8383

8484
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
85-
service/mssql-sql-statefull-deploy ClusterIP None <none> 1433/TCP 16m
85+
service/mssql-sql-server-rancher ClusterIP None <none> 1433/TCP 16m
8686

8787
NAME READY AGE
88-
statefulset.apps/mssql-sql-statefull-deploy 3/3 16m
88+
statefulset.apps/mssql-sql-server-rancher 3/3 16m
8989
```
9090

9191
This chart also includes an extra folder called "services" this folder has two more manifest files as described below:
@@ -101,8 +101,8 @@ Once you deploy the above files as well, using the commands shown below, you sho
101101

102102

103103
```bash
104-
D:\helm-charts\sql-statefull-deploy>kubectl apply -f "D:\helm-charts\sql-statefull-deploy\services\ex_service.yaml"
105-
D:\helm-charts\sql-statefull-deploy>kubectl apply -f "D:\helm-charts\sql-statefull-deploy\services\ag_endpoint.yaml"
104+
D:\helm-charts\sql-server-rancher>kubectl apply -f "D:\helm-charts\sql-server-rancher\services\ex_service.yaml"
105+
D:\helm-charts\sql-server-rancher>kubectl apply -f "D:\helm-charts\sql-server-rancher\services\ag_endpoint.yaml"
106106
```
107107

108108

@@ -112,26 +112,26 @@ Finally, after all the deployments here are the resources that you should see:
112112
```bash
113113
D:\>kubectl get all
114114
NAME READY STATUS RESTARTS AGE
115-
pod/mssql-sql-statefull-deploy-0 1/1 Running 0 127m
116-
pod/mssql-sql-statefull-deploy-1 1/1 Running 0 126m
117-
pod/mssql-sql-statefull-deploy-2 1/1 Running 0 125m
115+
pod/mssql-sql-server-rancher-0 1/1 Running 0 127m
116+
pod/mssql-sql-server-rancher-1 1/1 Running 0 126m
117+
pod/mssql-sql-server-rancher-2 1/1 Running 0 125m
118118

119119
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
120120
service/kubernetes ClusterIP 10.0.0.1 <none> 443/TCP 220d
121121
service/mssql-mirror-0 ClusterIP 10.0.148.0 <none> 5022/TCP 124m
122122
service/mssql-mirror-1 ClusterIP 10.0.254.58 <none> 5022/TCP 124m
123123
service/mssql-mirror-2 ClusterIP 10.0.196.129 <none> 5022/TCP 124m
124-
service/mssql-sql-statefull-deploy ClusterIP None <none> 1433/TCP 127m
125-
service/mssql-sql-statefull-deploy-0 LoadBalancer 10.0.238.203 104.211.231.206 1433:30923/TCP 124m
126-
service/mssql-sql-statefull-deploy-1 LoadBalancer 10.0.96.108 104.211.203.78 1433:32695/TCP 124m
127-
service/mssql-sql-statefull-deploy-2 LoadBalancer 10.0.78.10 104.211.203.159 1433:31042/TCP 124m
124+
service/mssql-sql-server-rancher ClusterIP None <none> 1433/TCP 127m
125+
service/mssql-sql-server-rancher-0 LoadBalancer 10.0.238.203 104.211.231.206 1433:30923/TCP 124m
126+
service/mssql-sql-server-rancher-1 LoadBalancer 10.0.96.108 104.211.203.78 1433:32695/TCP 124m
127+
service/mssql-sql-server-rancher-2 LoadBalancer 10.0.78.10 104.211.203.159 1433:31042/TCP 124m
128128

129129
NAME READY AGE
130-
statefulset.apps/mssql-sql-statefull-deploy 3/3 127m
130+
statefulset.apps/mssql-sql-server-rancher 3/3 127m
131131
```
132132

133133
## Connect to SQL Server
134134

135-
Now you are ready to connect to the SQL Server using any of the familiar tools that you work with, like the [SSMS](https://docs.microsoft.com/en-us/sql/ssms/download-sql-server-management-studio-ssms?view=sql-server-ver15) (SQL Server Management Studio) or [SQLCMD](https://docs.microsoft.com/en-us/sql/tools/sqlcmd-utility?view=sql-server-ver15) or [ADS](https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio?view=sql-server-ver15) (Azure Data Studio), etc. The IP address that you will use to connect is the External-IP address for the pod service which in this case one such example is: to connect to mssql-sql-statefull-deploy-0 SQL Server, the IP address 104.211.231.206 will be used in ssms or any other client.
135+
Now you are ready to connect to the SQL Server using any of the familiar tools that you work with, like the [SSMS](https://docs.microsoft.com/en-us/sql/ssms/download-sql-server-management-studio-ssms?view=sql-server-ver15) (SQL Server Management Studio) or [SQLCMD](https://docs.microsoft.com/en-us/sql/tools/sqlcmd-utility?view=sql-server-ver15) or [ADS](https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio?view=sql-server-ver15) (Azure Data Studio), etc. The IP address that you will use to connect is the External-IP address for the pod service which in this case one such example is: to connect to mssql-sql-server-rancher-0 SQL Server, the IP address 104.211.231.206 will be used in ssms or any other client.
136136

137137
For more details on the SQL Server deployment on AKS using manual method please refer [Deploy a SQL Server container in Kubernetes with Azure Kubernetes Services (AKS)](https://docs.microsoft.com/en-us/sql/linux/tutorial-sql-server-containers-kubernetes?view=sql-server-ver15).

‎linux/rancher/templates/_helpers.tpl‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
{{/*
22
Expand the name of the chart.
33
*/}}
4-
{{- define "sql-statefull-deploy.name" -}}
5-
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
4+
{{- define "sql-server-rancher.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
66
{{- end }}
77

88
{{/*
99
Create a default fully qualified app name.
1010
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1111
If release name contains chart name it will be used as a full name.
1212
*/}}
13-
{{- define "sql-statefull-deploy.fullname" -}}
14-
{{- if .Values.fullnameOverride }}
15-
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
16-
{{- else }}
17-
{{- $name := default .Chart.Name .Values.nameOverride }}
18-
{{- if contains $name .Release.Name }}
19-
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
20-
{{- else }}
21-
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
22-
{{- end }}
23-
{{- end }}
13+
{{- define "sql-server-rancher.fullname" -}}
14+
{{- if .Values.fullnameOverride }}
15+
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
16+
{{- else }}
17+
{{- $name := default .Chart.Name .Values.nameOverride }}
18+
{{- if contains $name .Release.Name }}
19+
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
20+
{{- else }}
21+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
22+
{{- end }}
23+
{{- end }}
2424
{{- end }}
2525

2626
{{/*
2727
Create chart name and version as used by the chart label.
2828
*/}}
29-
{{- define "sql-statefull-deploy.chart" -}}
30-
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
29+
{{- define "sql-server-rancher.chart" -}}
30+
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
3131
{{- end }}
3232

3333
{{/*
3434
Common labels
3535
*/}}
36-
{{- define "sql-statefull-deploy.labels" -}}
37-
helm.sh/chart: {{ include "sql-statefull-deploy.chart" . }}
38-
{{ include "sql-statefull-deploy.selectorLabels" . }}
36+
{{- define "sql-server-rancher.labels" -}}
37+
helm.sh/chart: {{ include "sql-server-rancher.chart" . }}
38+
{{ include "sql-server-rancher.selectorLabels" . }}
3939
{{- if .Chart.AppVersion }}
4040
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4141
{{- end }}
@@ -45,18 +45,18 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
4545
{{/*
4646
Selector labels
4747
*/}}
48-
{{- define "sql-statefull-deploy.selectorLabels" -}}
49-
app.kubernetes.io/name: {{ include "sql-statefull-deploy.name" . }}
48+
{{- define "sql-server-rancher.selectorLabels" -}}
49+
app.kubernetes.io/name: {{ include "sql-server-rancher.name" . }}
5050
app.kubernetes.io/instance: {{ .Release.Name }}
5151
{{- end }}
5252

5353
{{/*
5454
Create the name of the service account to use
5555
*/}}
56-
{{- define "sql-statefull-deploy.serviceAccountName" -}}
57-
{{- if .Values.serviceAccount.create }}
58-
{{- default (include "sql-statefull-deploy.fullname" .) .Values.serviceAccount.name }}
59-
{{- else }}
60-
{{- default "default" .Values.serviceAccount.name }}
61-
{{- end }}
56+
{{- define "sql-server-rancher.serviceAccountName" -}}
57+
{{- if .Values.serviceAccount.create }}
58+
{{- default (include "sql-server-rancher.fullname" .) .Values.serviceAccount.name }}
59+
{{- else }}
60+
{{- default "default" .Values.serviceAccount.name }}
61+
{{- end }}
6262
{{- end }}

‎linux/rancher/templates/sc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
kind: StorageClass
2-
apiVersion: storage.k8s.io/v1beta1
2+
apiVersion: storage.k8s.io/v1
33
metadata:
44
name: azure-disk
55
provisioner: kubernetes.io/azure-disk
66
parameters:
77
storageaccounttype: Standard_LRS
8-
kind: Managed
8+
kind: Managed

‎linux/rancher/templates/secret.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Secret
33
metadata:
44
name: mssql-secret
55
labels:
6-
{{- include "sql-statefull-deploy.labels" . | nindent 4 }}
6+
{{- include "sql-server-rancher.labels" . | nindent 4 }}
77
type: Opaque
88
data:
99
mssql_sa_password : {{ .Values.MSSQL_SA_PASSWORD | b64enc | quote }}

‎linux/rancher/templates/service.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: {{ include "sql-statefull-deploy.fullname" . }}
4+
name: {{ include "sql-server-rancher.fullname" . }}
55
labels:
6-
{{- include "sql-statefull-deploy.labels" . | nindent 4 }}
6+
{{- include "sql-server-rancher.labels" . | nindent 4 }}
77
spec:
88
clusterIP: None
99
ports:
1010
- port: {{ .Values.service.port }}
1111
targetPort: http
1212
protocol: TCP
1313
selector:
14-
{{- include "sql-statefull-deploy.selectorLabels" . | nindent 4 }}
14+
{{- include "sql-server-rancher.selectorLabels" . | nindent 4 }}

‎linux/rancher/templates/statefulset.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
4-
name: {{ include "sql-statefull-deploy.fullname" . }}
4+
name: {{ include "sql-server-rancher.fullname" . }}
55
labels:
6-
{{- include "sql-statefull-deploy.labels" . | nindent 4 }}
6+
{{- include "sql-server-rancher.labels" . | nindent 4 }}
77
spec:
8-
serviceName: {{ include "sql-statefull-deploy.fullname" . }}
8+
serviceName: {{ include "sql-server-rancher.fullname" . }}
99
replicas: {{ .Values.replicas }}
1010
selector:
1111
matchLabels:
12-
{{- include "sql-statefull-deploy.selectorLabels" . | nindent 6 }}
12+
{{- include "sql-server-rancher.selectorLabels" . | nindent 6 }}
1313
template:
1414
metadata:
1515
{{- with .Values.podAnnotations }}
1616
annotations:
1717
{{- toYaml . | nindent 8 }}
1818
{{- end }}
1919
labels:
20-
{{- include "sql-statefull-deploy.selectorLabels" . | nindent 8 }}
20+
{{- include "sql-server-rancher.selectorLabels" . | nindent 8 }}
2121
spec:
2222
securityContext:
2323
{{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -60,4 +60,4 @@ spec:
6060
- ReadWriteOnce
6161
resources:
6262
requests:
63-
storage: 8Gi
63+
storage: 8Gi

‎linux/rancher/values.test.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# since a default SA_PASSWORD is not set, this is used for helm lint and helm debug, otherwise unused
2+
MSSQL_SA_PASSWORD: Sfr9nxVVkbMVGTQweKmD

0 commit comments

Comments
 (0)