Skip to content

Commit 68520e5

Browse files
hakmanhakman
committed
etcd-manager: Remove kops-utils-cp
1 parent d99447c commit 68520e5

File tree

5 files changed

+0
-643
lines changed

5 files changed

+0
-643
lines changed

‎pkg/model/components/etcdmanager/model.go‎

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424

2525
v1 "k8s.io/api/core/v1"
2626
"k8s.io/apimachinery/pkg/api/resource"
27-
"k8s.io/apimachinery/pkg/util/sets"
2827
"k8s.io/klog/v2"
2928
"k8s.io/kops/pkg/apis/kops"
3029
"k8s.io/kops/pkg/assets"
@@ -236,88 +235,6 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
236235
}
237236
}
238237

239-
{
240-
utilMounts := []v1.VolumeMount{
241-
{
242-
MountPath: "/opt",
243-
Name: "opt",
244-
},
245-
}
246-
{
247-
initContainer := v1.Container{
248-
Name: "kops-utils-cp",
249-
Image: kopsUtilsImage,
250-
Command: []string{"/ko-app/kops-utils-cp"},
251-
Args: []string{
252-
"--target-dir=/opt/kops-utils/",
253-
"--src=/ko-app/kops-utils-cp",
254-
},
255-
VolumeMounts: utilMounts,
256-
}
257-
pod.Spec.InitContainers = append(pod.Spec.InitContainers, initContainer)
258-
}
259-
260-
symlinkToVersions := sets.NewString()
261-
for _, etcdVersion := range etcdSupportedVersions() {
262-
if etcdVersion.SymlinkToVersion != "" {
263-
symlinkToVersions.Insert(etcdVersion.SymlinkToVersion)
264-
continue
265-
}
266-
267-
initContainer := v1.Container{
268-
Name: "init-etcd-" + strings.ReplaceAll(etcdVersion.Version, ".", "-"),
269-
Image: etcdVersion.Image,
270-
Command: []string{"/opt/kops-utils/kops-utils-cp"},
271-
VolumeMounts: utilMounts,
272-
}
273-
274-
initContainer.Args = []string{
275-
"--target-dir=/opt/etcd-v" + etcdVersion.Version,
276-
"--src=/usr/local/bin/etcd",
277-
"--src=/usr/local/bin/etcdctl",
278-
}
279-
280-
pod.Spec.InitContainers = append(pod.Spec.InitContainers, initContainer)
281-
}
282-
283-
for _, symlinkToVersion := range symlinkToVersions.List() {
284-
targetVersions := sets.NewString()
285-
286-
for _, etcdVersion := range etcdSupportedVersions() {
287-
if etcdVersion.SymlinkToVersion == symlinkToVersion {
288-
targetVersions.Insert(etcdVersion.Version)
289-
}
290-
}
291-
292-
initContainer := v1.Container{
293-
Name: "init-etcd-symlinks-" + strings.ReplaceAll(symlinkToVersion, ".", "-"),
294-
Image: kopsUtilsImage,
295-
Command: []string{"/opt/kops-utils/kops-utils-cp"},
296-
VolumeMounts: utilMounts,
297-
}
298-
299-
initContainer.Args = []string{
300-
"--symlink",
301-
}
302-
for _, targetVersion := range targetVersions.List() {
303-
initContainer.Args = append(initContainer.Args, "--target-dir=/opt/etcd-v"+targetVersion)
304-
}
305-
// NOTE: Flags must come before positional arguments
306-
initContainer.Args = append(initContainer.Args,
307-
"--src=/opt/etcd-v"+symlinkToVersion+"/etcd",
308-
"--src=/opt/etcd-v"+symlinkToVersion+"/etcdctl",
309-
)
310-
311-
pod.Spec.InitContainers = append(pod.Spec.InitContainers, initContainer)
312-
}
313-
314-
// Remap image via AssetBuilder
315-
for i := range pod.Spec.InitContainers {
316-
initContainer := &pod.Spec.InitContainers[i]
317-
initContainer.Image = b.AssetBuilder.RemapImage(initContainer.Image)
318-
}
319-
}
320-
321238
{
322239
if len(pod.Spec.Containers) != 1 {
323240
return nil, fmt.Errorf("expected exactly one container in etcd-manager Pod, found %d", len(pod.Spec.Containers))

‎pkg/model/components/etcdmanager/tests/interval/tasks.yaml‎

Lines changed: 0 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -131,76 +131,6 @@ Contents: |
131131
name: varlogetcd
132132
hostNetwork: true
133133
hostPID: true
134-
initContainers:
135-
- args:
136-
- --target-dir=/opt/kops-utils/
137-
- --src=/ko-app/kops-utils-cp
138-
command:
139-
- /ko-app/kops-utils-cp
140-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
141-
name: kops-utils-cp
142-
resources: {}
143-
volumeMounts:
144-
- mountPath: /opt
145-
name: opt
146-
- args:
147-
- --target-dir=/opt/etcd-v3.4.13
148-
- --src=/usr/local/bin/etcd
149-
- --src=/usr/local/bin/etcdctl
150-
command:
151-
- /opt/kops-utils/kops-utils-cp
152-
image: registry.k8s.io/etcd:v3.4.13
153-
name: init-etcd-3-4-13
154-
resources: {}
155-
volumeMounts:
156-
- mountPath: /opt
157-
name: opt
158-
- args:
159-
- --target-dir=/opt/etcd-v3.5.21
160-
- --src=/usr/local/bin/etcd
161-
- --src=/usr/local/bin/etcdctl
162-
command:
163-
- /opt/kops-utils/kops-utils-cp
164-
image: registry.k8s.io/etcd:v3.5.21
165-
name: init-etcd-3-5-21
166-
resources: {}
167-
volumeMounts:
168-
- mountPath: /opt
169-
name: opt
170-
- args:
171-
- --symlink
172-
- --target-dir=/opt/etcd-v3.4.3
173-
- --src=/opt/etcd-v3.4.13/etcd
174-
- --src=/opt/etcd-v3.4.13/etcdctl
175-
command:
176-
- /opt/kops-utils/kops-utils-cp
177-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
178-
name: init-etcd-symlinks-3-4-13
179-
resources: {}
180-
volumeMounts:
181-
- mountPath: /opt
182-
name: opt
183-
- args:
184-
- --symlink
185-
- --target-dir=/opt/etcd-v3.5.0
186-
- --target-dir=/opt/etcd-v3.5.1
187-
- --target-dir=/opt/etcd-v3.5.13
188-
- --target-dir=/opt/etcd-v3.5.17
189-
- --target-dir=/opt/etcd-v3.5.3
190-
- --target-dir=/opt/etcd-v3.5.4
191-
- --target-dir=/opt/etcd-v3.5.6
192-
- --target-dir=/opt/etcd-v3.5.7
193-
- --target-dir=/opt/etcd-v3.5.9
194-
- --src=/opt/etcd-v3.5.21/etcd
195-
- --src=/opt/etcd-v3.5.21/etcdctl
196-
command:
197-
- /opt/kops-utils/kops-utils-cp
198-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
199-
name: init-etcd-symlinks-3-5-21
200-
resources: {}
201-
volumeMounts:
202-
- mountPath: /opt
203-
name: opt
204134
priorityClassName: system-cluster-critical
205135
tolerations:
206136
- key: CriticalAddonsOnly
@@ -306,76 +236,6 @@ Contents: |
306236
name: varlogetcd
307237
hostNetwork: true
308238
hostPID: true
309-
initContainers:
310-
- args:
311-
- --target-dir=/opt/kops-utils/
312-
- --src=/ko-app/kops-utils-cp
313-
command:
314-
- /ko-app/kops-utils-cp
315-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
316-
name: kops-utils-cp
317-
resources: {}
318-
volumeMounts:
319-
- mountPath: /opt
320-
name: opt
321-
- args:
322-
- --target-dir=/opt/etcd-v3.4.13
323-
- --src=/usr/local/bin/etcd
324-
- --src=/usr/local/bin/etcdctl
325-
command:
326-
- /opt/kops-utils/kops-utils-cp
327-
image: registry.k8s.io/etcd:v3.4.13
328-
name: init-etcd-3-4-13
329-
resources: {}
330-
volumeMounts:
331-
- mountPath: /opt
332-
name: opt
333-
- args:
334-
- --target-dir=/opt/etcd-v3.5.21
335-
- --src=/usr/local/bin/etcd
336-
- --src=/usr/local/bin/etcdctl
337-
command:
338-
- /opt/kops-utils/kops-utils-cp
339-
image: registry.k8s.io/etcd:v3.5.21
340-
name: init-etcd-3-5-21
341-
resources: {}
342-
volumeMounts:
343-
- mountPath: /opt
344-
name: opt
345-
- args:
346-
- --symlink
347-
- --target-dir=/opt/etcd-v3.4.3
348-
- --src=/opt/etcd-v3.4.13/etcd
349-
- --src=/opt/etcd-v3.4.13/etcdctl
350-
command:
351-
- /opt/kops-utils/kops-utils-cp
352-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
353-
name: init-etcd-symlinks-3-4-13
354-
resources: {}
355-
volumeMounts:
356-
- mountPath: /opt
357-
name: opt
358-
- args:
359-
- --symlink
360-
- --target-dir=/opt/etcd-v3.5.0
361-
- --target-dir=/opt/etcd-v3.5.1
362-
- --target-dir=/opt/etcd-v3.5.13
363-
- --target-dir=/opt/etcd-v3.5.17
364-
- --target-dir=/opt/etcd-v3.5.3
365-
- --target-dir=/opt/etcd-v3.5.4
366-
- --target-dir=/opt/etcd-v3.5.6
367-
- --target-dir=/opt/etcd-v3.5.7
368-
- --target-dir=/opt/etcd-v3.5.9
369-
- --src=/opt/etcd-v3.5.21/etcd
370-
- --src=/opt/etcd-v3.5.21/etcdctl
371-
command:
372-
- /opt/kops-utils/kops-utils-cp
373-
image: registry.k8s.io/kops/kops-utils-cp:1.33.0-beta.1
374-
name: init-etcd-symlinks-3-5-21
375-
resources: {}
376-
volumeMounts:
377-
- mountPath: /opt
378-
name: opt
379239
priorityClassName: system-cluster-critical
380240
tolerations:
381241
- key: CriticalAddonsOnly

0 commit comments

Comments
 (0)