Skip to content

Commit cb64d95

Browse files
amoreypavansaikrishna78
authored andcommitted
new: upgrade kubetail addon to 0.13.3 (kubernetes#21244)
* chore: kubetail-dashboard => 0.6.3 * chore: kubetail-cluster-api => 0.4.2 * chore: kubetail-cluster-agent => 0.4.2 * new: remove token-based csrf config options from addon templates * new: update addon config to new schema Signed-off-by: Andres Morey <[email protected]>
1 parent 190f89f commit cb64d95

File tree

5 files changed

+32
-59
lines changed

5 files changed

+32
-59
lines changed

deploy/addons/kubetail/kubetail-cli.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
kubernetes.io/minikube-addons: kubetail
88
addonmanager.kubernetes.io/mode: Reconcile
99
app.kubernetes.io/name: kubetail
10-
app.kubernetes.io/version: "0.11.5"
10+
app.kubernetes.io/version: "0.13.3"
1111
app.kubernetes.io/instance: kubetail
1212
app.kubernetes.io/component: cli
1313
---
@@ -19,7 +19,7 @@ metadata:
1919
kubernetes.io/minikube-addons: kubetail
2020
addonmanager.kubernetes.io/mode: Reconcile
2121
app.kubernetes.io/name: kubetail
22-
app.kubernetes.io/version: "0.11.5"
22+
app.kubernetes.io/version: "0.13.3"
2323
app.kubernetes.io/instance: kubetail
2424
app.kubernetes.io/component: cli
2525
rules:
@@ -41,7 +41,7 @@ metadata:
4141
kubernetes.io/minikube-addons: kubetail
4242
addonmanager.kubernetes.io/mode: Reconcile
4343
app.kubernetes.io/name: kubetail
44-
app.kubernetes.io/version: "0.11.5"
44+
app.kubernetes.io/version: "0.13.3"
4545
app.kubernetes.io/instance: kubetail
4646
app.kubernetes.io/component: cli
4747
roleRef:

deploy/addons/kubetail/kubetail-cluster-agent.yaml.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
kubernetes.io/minikube-addons: kubetail
88
addonmanager.kubernetes.io/mode: Reconcile
99
app.kubernetes.io/name: kubetail
10-
app.kubernetes.io/version: "0.11.5"
10+
app.kubernetes.io/version: "0.13.3"
1111
app.kubernetes.io/instance: kubetail
1212
app.kubernetes.io/component: cluster-agent
1313
data:
@@ -33,7 +33,7 @@ metadata:
3333
kubernetes.io/minikube-addons: kubetail
3434
addonmanager.kubernetes.io/mode: Reconcile
3535
app.kubernetes.io/name: kubetail
36-
app.kubernetes.io/version: "0.11.5"
36+
app.kubernetes.io/version: "0.13.3"
3737
app.kubernetes.io/instance: kubetail
3838
app.kubernetes.io/component: cluster-agent
3939
---
@@ -46,7 +46,7 @@ metadata:
4646
kubernetes.io/minikube-addons: kubetail
4747
addonmanager.kubernetes.io/mode: Reconcile
4848
app.kubernetes.io/name: kubetail
49-
app.kubernetes.io/version: "0.11.5"
49+
app.kubernetes.io/version: "0.13.3"
5050
app.kubernetes.io/instance: kubetail
5151
app.kubernetes.io/component: cluster-agent
5252
spec:
@@ -59,7 +59,7 @@ spec:
5959
metadata:
6060
labels:
6161
app.kubernetes.io/name: kubetail
62-
app.kubernetes.io/version: "0.11.5"
62+
app.kubernetes.io/version: "0.13.3"
6363
app.kubernetes.io/instance: kubetail
6464
app.kubernetes.io/component: cluster-agent
6565
spec:
@@ -138,7 +138,7 @@ metadata:
138138
kubernetes.io/minikube-addons: kubetail
139139
addonmanager.kubernetes.io/mode: Reconcile
140140
app.kubernetes.io/name: kubetail
141-
app.kubernetes.io/version: "0.11.5"
141+
app.kubernetes.io/version: "0.13.3"
142142
app.kubernetes.io/instance: kubetail
143143
app.kubernetes.io/component: cluster-agent
144144
spec:
@@ -157,7 +157,7 @@ metadata:
157157
kubernetes.io/minikube-addons: kubetail
158158
addonmanager.kubernetes.io/mode: Reconcile
159159
app.kubernetes.io/name: kubetail
160-
app.kubernetes.io/version: "0.11.5"
160+
app.kubernetes.io/version: "0.13.3"
161161
app.kubernetes.io/instance: kubetail
162162
app.kubernetes.io/component: cluster-agent
163163
spec:

deploy/addons/kubetail/kubetail-cluster-api.yaml.tmpl

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,18 @@ metadata:
77
kubernetes.io/minikube-addons: kubetail
88
addonmanager.kubernetes.io/mode: Reconcile
99
app.kubernetes.io/name: kubetail
10-
app.kubernetes.io/version: "0.11.5"
10+
app.kubernetes.io/version: "0.13.3"
1111
app.kubernetes.io/instance: kubetail
1212
app.kubernetes.io/component: cluster-api
1313
data:
1414
config.yaml: |
1515
cluster-api:
1616
addr: :8080
17-
cluster-agent-dispatch-url: "kubernetes://kubetail-cluster-agent:50051"
1817
base-path: /
18+
cluster-agent:
19+
dispatch-url: "kubernetes://kubetail-cluster-agent:50051"
1920
csrf:
20-
cookie:
21-
domain: null
22-
http-only: true
23-
max-age: 43200
24-
name: kubetail_cluster_api_csrf
25-
path: /
26-
same-site: strict
27-
secure: false
2821
enabled: true
29-
field-name: csrf_token
30-
secret: ${KUBETAIL_CLUSTER_API_CSRF_SECRET}
3122
gin-mode: release
3223
logging:
3324
access-log:
@@ -51,7 +42,7 @@ metadata:
5142
kubernetes.io/minikube-addons: kubetail
5243
addonmanager.kubernetes.io/mode: Reconcile
5344
app.kubernetes.io/name: kubetail
54-
app.kubernetes.io/version: "0.11.5"
45+
app.kubernetes.io/version: "0.13.3"
5546
app.kubernetes.io/instance: "kubetail"
5647
app.kubernetes.io/component: "cluster-api"
5748
---
@@ -63,7 +54,7 @@ metadata:
6354
kubernetes.io/minikube-addons: kubetail
6455
addonmanager.kubernetes.io/mode: Reconcile
6556
app.kubernetes.io/name: kubetail
66-
app.kubernetes.io/version: "0.11.5"
57+
app.kubernetes.io/version: "0.13.3"
6758
app.kubernetes.io/instance: kubetail
6859
app.kubernetes.io/component: cluster-api
6960
rules:
@@ -82,7 +73,7 @@ metadata:
8273
kubernetes.io/minikube-addons: kubetail
8374
addonmanager.kubernetes.io/mode: Reconcile
8475
app.kubernetes.io/name: kubetail
85-
app.kubernetes.io/version: "0.11.5"
76+
app.kubernetes.io/version: "0.13.3"
8677
app.kubernetes.io/instance: kubetail
8778
app.kubernetes.io/component: cluster-api
8879
roleRef:
@@ -103,7 +94,7 @@ metadata:
10394
kubernetes.io/minikube-addons: kubetail
10495
addonmanager.kubernetes.io/mode: Reconcile
10596
app.kubernetes.io/name: kubetail
106-
app.kubernetes.io/version: "0.11.5"
97+
app.kubernetes.io/version: "0.13.3"
10798
app.kubernetes.io/instance: kubetail
10899
app.kubernetes.io/component: cluster-api
109100
rules:
@@ -120,7 +111,7 @@ metadata:
120111
kubernetes.io/minikube-addons: kubetail
121112
addonmanager.kubernetes.io/mode: Reconcile
122113
app.kubernetes.io/name: kubetail
123-
app.kubernetes.io/version: "0.11.5"
114+
app.kubernetes.io/version: "0.13.3"
124115
app.kubernetes.io/instance: kubetail
125116
app.kubernetes.io/component: cluster-api
126117
roleRef:
@@ -141,7 +132,7 @@ metadata:
141132
kubernetes.io/minikube-addons: kubetail
142133
addonmanager.kubernetes.io/mode: Reconcile
143134
app.kubernetes.io/name: kubetail
144-
app.kubernetes.io/version: "0.11.5"
135+
app.kubernetes.io/version: "0.13.3"
145136
app.kubernetes.io/instance: kubetail
146137
app.kubernetes.io/component: cluster-api
147138
spec:
@@ -158,7 +149,7 @@ spec:
158149
metadata:
159150
labels:
160151
app.kubernetes.io/name: kubetail
161-
app.kubernetes.io/version: "0.11.5"
152+
app.kubernetes.io/version: "0.13.3"
162153
app.kubernetes.io/instance: kubetail
163154
app.kubernetes.io/component: cluster-api
164155
spec:
@@ -176,9 +167,6 @@ spec:
176167
runAsGroup: 1000
177168
runAsUser: 1000
178169
imagePullPolicy: IfNotPresent
179-
env:
180-
- name: KUBETAIL_CLUSTER_API_CSRF_SECRET
181-
value: "DUMMY"
182170
args:
183171
- --config=/etc/kubetail/config.yaml
184172
ports:
@@ -221,7 +209,7 @@ metadata:
221209
kubernetes.io/minikube-addons: kubetail
222210
addonmanager.kubernetes.io/mode: Reconcile
223211
app.kubernetes.io/name: kubetail
224-
app.kubernetes.io/version: "0.11.5"
212+
app.kubernetes.io/version: "0.13.3"
225213
app.kubernetes.io/instance: kubetail
226214
app.kubernetes.io/component: cluster-api
227215
spec:

deploy/addons/kubetail/kubetail-dashboard.yaml.tmpl

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
kubernetes.io/minikube-addons: kubetail
88
addonmanager.kubernetes.io/mode: Reconcile
99
app.kubernetes.io/name: kubetail
10-
app.kubernetes.io/version: "0.11.5"
10+
app.kubernetes.io/version: "0.13.3"
1111
app.kubernetes.io/instance: kubetail
1212
app.kubernetes.io/component: dashboard
1313
data:
@@ -21,17 +21,7 @@ data:
2121
cluster-api-enabled: true
2222
base-path: /
2323
csrf:
24-
cookie:
25-
domain: null
26-
http-only: true
27-
max-age: 43200
28-
name: kubetail_dashhboard_csrf
29-
path: /
30-
same-site: strict
31-
secure: false
3224
enabled: true
33-
field-name: csrf_token
34-
secret: ${KUBETAIL_DASHBOARD_CSRF_SECRET}
3525
gin-mode: release
3626
logging:
3727
access-log:
@@ -65,7 +55,7 @@ metadata:
6555
kubernetes.io/minikube-addons: kubetail
6656
addonmanager.kubernetes.io/mode: Reconcile
6757
app.kubernetes.io/name: kubetail
68-
app.kubernetes.io/version: "0.11.5"
58+
app.kubernetes.io/version: "0.13.3"
6959
app.kubernetes.io/instance: kubetail
7060
app.kubernetes.io/component: dashboard
7161
---
@@ -77,7 +67,7 @@ metadata:
7767
kubernetes.io/minikube-addons: kubetail
7868
addonmanager.kubernetes.io/mode: Reconcile
7969
app.kubernetes.io/name: kubetail
80-
app.kubernetes.io/version: "0.11.5"
70+
app.kubernetes.io/version: "0.13.3"
8171
app.kubernetes.io/instance: kubetail
8272
app.kubernetes.io/component: dashboard
8373
rules:
@@ -96,7 +86,7 @@ metadata:
9686
kubernetes.io/minikube-addons: kubetail
9787
addonmanager.kubernetes.io/mode: Reconcile
9888
app.kubernetes.io/name: kubetail
99-
app.kubernetes.io/version: "0.11.5"
89+
app.kubernetes.io/version: "0.13.3"
10090
app.kubernetes.io/instance: kubetail
10191
app.kubernetes.io/component: dashboard
10292
roleRef:
@@ -117,7 +107,7 @@ metadata:
117107
kubernetes.io/minikube-addons: kubetail
118108
addonmanager.kubernetes.io/mode: Reconcile
119109
app.kubernetes.io/name: kubetail
120-
app.kubernetes.io/version: "0.11.5"
110+
app.kubernetes.io/version: "0.13.3"
121111
app.kubernetes.io/instance: kubetail
122112
app.kubernetes.io/component: dashboard
123113
rules:
@@ -134,7 +124,7 @@ metadata:
134124
kubernetes.io/minikube-addons: kubetail
135125
addonmanager.kubernetes.io/mode: Reconcile
136126
app.kubernetes.io/name: kubetail
137-
app.kubernetes.io/version: "0.11.5"
127+
app.kubernetes.io/version: "0.13.3"
138128
app.kubernetes.io/instance: kubetail
139129
app.kubernetes.io/component: dashboard
140130
roleRef:
@@ -155,7 +145,7 @@ metadata:
155145
kubernetes.io/minikube-addons: kubetail
156146
addonmanager.kubernetes.io/mode: Reconcile
157147
app.kubernetes.io/name: kubetail
158-
app.kubernetes.io/version: "0.11.5"
148+
app.kubernetes.io/version: "0.13.3"
159149
app.kubernetes.io/instance: kubetail
160150
app.kubernetes.io/component: dashboard
161151
spec:
@@ -172,7 +162,7 @@ spec:
172162
metadata:
173163
labels:
174164
app.kubernetes.io/name: kubetail
175-
app.kubernetes.io/version: "0.11.5"
165+
app.kubernetes.io/version: "0.13.3"
176166
app.kubernetes.io/instance: kubetail
177167
app.kubernetes.io/component: dashboard
178168
spec:
@@ -190,11 +180,6 @@ spec:
190180
runAsGroup: 1000
191181
runAsUser: 1000
192182
imagePullPolicy: IfNotPresent
193-
env:
194-
- name: KUBETAIL_DASHBOARD_CSRF_SECRET
195-
value: "DUMMY"
196-
- name: KUBETAIL_DASHBOARD_SESSION_SECRET
197-
value: "DUMMY"
198183
args:
199184
- --config=/etc/kubetail/config.yaml
200185
ports:
@@ -237,7 +222,7 @@ metadata:
237222
kubernetes.io/minikube-addons: kubetail
238223
addonmanager.kubernetes.io/mode: Reconcile
239224
app.kubernetes.io/name: kubetail
240-
app.kubernetes.io/version: "0.11.5"
225+
app.kubernetes.io/version: "0.13.3"
241226
app.kubernetes.io/instance: kubetail
242227
app.kubernetes.io/component: dashboard
243228
spec:

pkg/minikube/assets/addons.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -806,9 +806,9 @@ var Addons = map[string]*Addon{
806806
MustBinAsset(addons.KubetailAssets, "kubetail/kubetail-cli.yaml", vmpath.GuestAddonsDir, "kubetail-cli.yaml", "0640"),
807807
}, false, "kubetail", "3rd party (kubetail.com)", "amorey", "https://minikube.sigs.k8s.io/docs/handbook/addons/kubetail/",
808808
map[string]string{
809-
"KubetailDashboard": "kubetail/kubetail-dashboard:0.6.0@sha256:fc8d01805c09f2ad3f5a2c94016e399ece4c03ff7275dc007a213281087490ac",
810-
"KubetailClusterAPI": "kubetail/kubetail-cluster-api:0.4.0@sha256:fec3154c589a31493f14ca5ecbbc48d3ad7bab6b5e30dcddabc2457bd297dae7",
811-
"KubetailClusterAgent": "kubetail/kubetail-cluster-agent:0.4.0@sha256:5363ca1a5394943aa6bf4c160860a8dc616c3e939d2006cfa902f8863e182bae",
809+
"KubetailDashboard": "kubetail/kubetail-dashboard:0.6.3@sha256:0350addb95c0b135422cf766ef7ed31dd110b1fb87aa74a600fc10508c782cfa",
810+
"KubetailClusterAPI": "kubetail/kubetail-cluster-api:0.4.2@sha256:67ebae5543164147d21045bff3f77607914b9408d82526866a90c664814b7316",
811+
"KubetailClusterAgent": "kubetail/kubetail-cluster-agent:0.4.2@sha256:09f72d4ae63ed6e105298a2a72d276f97a2c9954e2adaffe18389fc1a02353bf",
812812
},
813813
map[string]string{
814814
"Kubetail": "docker.io",

0 commit comments

Comments
 (0)