Skip to content

Commit 08349ef

Browse files
committed
Fix docker image using a .NET 9 preview
1 parent 15d94d6 commit 08349ef

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ USER elasticsearch
148148

149149
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
150150
chmod +x dotnet-install.sh && \
151-
./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
151+
./dotnet-install.sh --channel 9.0 --runtime aspnetcore && \
152152
rm dotnet-install.sh
153153

154154
EXPOSE 8080 9200
@@ -206,7 +206,7 @@ USER elasticsearch
206206

207207
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
208208
chmod +x dotnet-install.sh && \
209-
./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
209+
./dotnet-install.sh --channel 9.0 --runtime aspnetcore && \
210210
rm dotnet-install.sh
211211

212212
EXPOSE 8080 9200

k8s/elastic-monitor.yaml

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@ metadata:
55
namespace: elastic-system
66
spec:
77
version: 8.16.1
8-
podDisruptionBudget:
9-
spec:
10-
minAvailable: 2
11-
selector:
12-
matchLabels:
13-
elasticsearch.k8s.elastic.co/cluster-name: elastic-monitor
8+
podDisruptionBudget: {}
149
nodeSets:
1510
- name: main
16-
count: 3
11+
count: 1
1712
config:
1813
# if not setting max_map_count in an init container, then use this setting
1914
#node.store.allow_mmap: false

k8s/ex-prod-elasticsearch.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ metadata:
66
spec:
77
version: 8.16.1
88
image: exceptionless/elasticsearch:8.16.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
9-
# monitoring:
10-
# metrics:
11-
# elasticsearchRefs:
12-
# - name: elastic-monitor
13-
# namespace: elastic-system
14-
# logs:
15-
# elasticsearchRefs:
16-
# - name: elastic-monitor
17-
# namespace: elastic-system
9+
monitoring:
10+
metrics:
11+
elasticsearchRefs:
12+
- name: elastic-monitor
13+
namespace: elastic-system
14+
logs:
15+
elasticsearchRefs:
16+
- name: elastic-monitor
17+
namespace: elastic-system
1818
secureSettings:
1919
- secretName: ex-prod-snapshots
2020
http:

k8s/ex-prod-tasks.ps1

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
$ELASTIC_PASSWORD=$(kubectl get secret --namespace ex-prod "ex-prod-es-elastic-user" -o go-template='{{.data.elastic | base64decode }}')
33

44
# connect to kibana
5-
open "http://kibana-ex-prod.localtest.me:5660" && kubectl port-forward --namespace ex-prod service/ex-prod-kb-http 5660:5601
5+
$ELASTIC_JOB = kubectl port-forward --namespace ex-prod service/ex-prod-kb-http 5660:5601 &
6+
Remove-Job $ELASTIC_JOB
7+
Start-Process "http://elastic:$ELASTIC_PASSWORD@kibana-ex-prod.localtest.me:5660"
68

79
# port forward elasticsearch
810
$ELASTIC_JOB = kubectl port-forward --namespace ex-prod service/ex-prod-es-http 9260:9200 &
@@ -14,6 +16,8 @@ $ELASTIC_MONITOR_PASSWORD=$(kubectl get secret --namespace elastic-system "elast
1416
$ELASTIC_JOB = kubectl port-forward --namespace elastic-system service/elastic-monitor-es-http 9280:9200 &
1517
Remove-Job $ELASTIC_JOB
1618

19+
Start-Process "https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280"
20+
1721
curl -k https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cluster/health?pretty
1822
curl -k https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cat/allocation?v
1923
curl -k https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cluster/allocation/explain?pretty
@@ -28,7 +32,7 @@ kubectl exec --stdin --tty ex-prod-redis-node-0 -- /bin/bash -c "redis-cli -a $R
2832
# open kubernetes dashboard
2933
$DASHBOARD_PASSWORD=$(kubectl get secret --namespace kubernetes-dashboard admin-user-token-w8jg7 -o go-template='{{.data.token | base64decode }}')
3034
kubectl proxy
31-
open "http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/https:kubernetes-dashboard:/proxy/"
35+
Start-Process "http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/https:kubernetes-dashboard:/proxy/"
3236

3337
# open kubecost
3438
kubectl port-forward --namespace kubecost deployment/kubecost-cost-analyzer 9090

0 commit comments

Comments
 (0)