Skip to content

Commit 538033c

Browse files
carlmontanaricarlmontanari
authored
Merge pull request #159 from srl-labs/feat/redeploy-on-launcher
Feat/redeploy on launcher
2 parents 0c730d3 + 6a8e0fa commit 538033c

File tree

6 files changed

+165
-22
lines changed

6 files changed

+165
-22
lines changed

‎build/launcher.Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ FROM --platform=linux/amd64 debian:bookworm-slim
2525

2626
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2727

28-
ARG DOCKER_VERSION="5:25.*"
29-
ARG CONTAINERLAB_VERSION="0.51.*"
30-
ARG NERDCTL_VERSION="1.7.4"
28+
ARG DOCKER_VERSION="5:26.*"
29+
ARG CONTAINERLAB_VERSION="0.55.*"
30+
ARG NERDCTL_VERSION="1.7.6"
3131

3232
RUN apt-get update && \
3333
apt-get install -yq --no-install-recommends \

‎clabverter/clabverter.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type StatuslessTopology struct {
3939
// MustNewClabverter returns an instance of Clabverter or panics.
4040
func MustNewClabverter(
4141
topologyFile,
42-
topoSpecFile,
42+
topologySpecFile,
4343
outputDirectory,
4444
destinationNamespace,
4545
naming,
@@ -103,7 +103,7 @@ func MustNewClabverter(
103103
return &Clabverter{
104104
logger: clabverterLogger,
105105
topologyFile: topologyFile,
106-
topoSpecFile: topoSpecFile,
106+
topologySpecFile: topologySpecFile,
107107
githubToken: githubToken,
108108
outputDirectory: outputDirectory,
109109
stdout: stdout,
@@ -141,8 +141,8 @@ type Clabverter struct {
141141
topologyPathParent string
142142
isRemotePath bool
143143

144-
topoSpecFile string
145-
topoSpecFilePath string
144+
topologySpecFile string
145+
topologySpecFilePath string
146146

147147
githubGroup string
148148
githubRepo string
@@ -323,8 +323,8 @@ func (c *Clabverter) load() error {
323323
c.topologyPathParent = filepath.Dir(c.topologyPath)
324324
}
325325

326-
if c.topoSpecFile != "" {
327-
c.topoSpecFilePath, err = filepath.Abs(c.topoSpecFile)
326+
if c.topologySpecFile != "" {
327+
c.topologySpecFilePath, err = filepath.Abs(c.topologySpecFile)
328328
if err != nil {
329329
c.logger.Criticalf("failed determining absolute path of values file, error: %s", err)
330330

@@ -333,7 +333,7 @@ func (c *Clabverter) load() error {
333333
}
334334

335335
c.logger.Debugf(
336-
"determined fully qualified topology spec values file path as: %s", c.topoSpecFilePath,
336+
"determined fully qualified topology spec values file path as: %s", c.topologySpecFilePath,
337337
)
338338

339339
c.logger.Debug("attempting to load containerlab topology....")
@@ -530,11 +530,11 @@ func (c *Clabverter) handleManifest() error {
530530
func (c *Clabverter) mergeConfigSpecWithRenderedTopology(
531531
renderedTopologySpecBytes []byte,
532532
) ([]byte, error) {
533-
if c.topoSpecFilePath == "" {
533+
if c.topologySpecFilePath == "" {
534534
return renderedTopologySpecBytes, nil
535535
}
536536

537-
content, err := os.ReadFile(c.topoSpecFilePath)
537+
content, err := os.ReadFile(c.topologySpecFilePath)
538538
if err != nil {
539539
return nil, err
540540
}

‎clabverter/clabverter_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestClabvert(t *testing.T) {
2121
cases := []struct {
2222
name string
2323
topologyFile string
24-
topoSpecsFile string
24+
topologySpecFile string
2525
destinationNamespace string
2626
insecureRegistries string
2727
imagePullSecrets string
@@ -32,7 +32,7 @@ func TestClabvert(t *testing.T) {
3232
{
3333
name: "simple",
3434
topologyFile: "test-fixtures/clabversiontest/clab.yaml",
35-
topoSpecsFile: "",
35+
topologySpecFile: "",
3636
destinationNamespace: "notclabernetes",
3737
insecureRegistries: "1.2.3.4",
3838
imagePullSecrets: "regcred",
@@ -42,7 +42,7 @@ func TestClabvert(t *testing.T) {
4242
{
4343
name: "simple-no-explicit-namespace",
4444
topologyFile: "test-fixtures/clabversiontest/clab.yaml",
45-
topoSpecsFile: "test-fixtures/clabversiontest/specs.yaml",
45+
topologySpecFile: "test-fixtures/clabversiontest/specs.yaml",
4646
insecureRegistries: "1.2.3.4",
4747
imagePullSecrets: "",
4848
disableExpose: true,
@@ -89,7 +89,7 @@ func TestClabvert(t *testing.T) {
8989

9090
clabverter := clabernetesclabverter.MustNewClabverter(
9191
testCase.topologyFile,
92-
testCase.topoSpecsFile,
92+
testCase.topologySpecFile,
9393
actualDir,
9494
testCase.destinationNamespace,
9595
testCase.naming,

‎go.mod

+48-6
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ require (
77
github.com/carlmontanari/slurpeeth v0.0.0-20240209224827-246fa87e31f3
88
github.com/openconfig/kne v0.1.18
99
github.com/urfave/cli/v2 v2.27.2
10-
google.golang.org/protobuf v1.34.1
10+
google.golang.org/protobuf v1.34.2
1111
gopkg.in/yaml.v3 v3.0.1
12-
k8s.io/api v0.30.1
13-
k8s.io/apiextensions-apiserver v0.30.1
14-
k8s.io/apimachinery v0.30.1
12+
k8s.io/api v0.30.2
13+
k8s.io/apiextensions-apiserver v0.30.2
14+
k8s.io/apimachinery v0.30.2
1515
// pin back to help controller-runtime out
1616
// https://github.com/kubernetes-sigs/controller-runtime/issues/2788
17-
k8s.io/client-go v0.30.1
18-
k8s.io/klog/v2 v2.120.1
17+
k8s.io/client-go v0.30.2
18+
k8s.io/klog/v2 v2.130.0
1919
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a
2020
sigs.k8s.io/controller-runtime v0.18.4
2121
sigs.k8s.io/yaml v1.4.0
@@ -24,53 +24,95 @@ require (
2424
require golang.org/x/crypto v0.24.0
2525

2626
require (
27+
github.com/NYTimes/gziphandler v1.1.1 // indirect
28+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
29+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2730
github.com/beorn7/perks v1.0.1 // indirect
31+
github.com/blang/semver/v4 v4.0.0 // indirect
32+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2833
github.com/cespare/xxhash/v2 v2.2.0 // indirect
34+
github.com/coreos/go-semver v0.3.1 // indirect
35+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2936
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
3037
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3138
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3239
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3340
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
41+
github.com/felixge/httpsnoop v1.0.3 // indirect
3442
github.com/fsnotify/fsnotify v1.7.0 // indirect
3543
github.com/go-logr/logr v1.4.1 // indirect
44+
github.com/go-logr/stdr v1.2.2 // indirect
3645
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3746
github.com/go-openapi/jsonreference v0.20.2 // indirect
3847
github.com/go-openapi/swag v0.22.4 // indirect
3948
github.com/gogo/protobuf v1.3.2 // indirect
4049
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4150
github.com/golang/protobuf v1.5.4 // indirect
51+
github.com/google/cel-go v0.17.8 // indirect
4252
github.com/google/gnostic-models v0.6.8 // indirect
4353
github.com/google/go-cmp v0.6.0 // indirect
4454
github.com/google/gofuzz v1.2.0 // indirect
4555
github.com/google/uuid v1.4.0 // indirect
56+
github.com/gorilla/websocket v1.5.0 // indirect
57+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
58+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
4659
github.com/imdario/mergo v0.3.15 // indirect
60+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4761
github.com/josharian/intern v1.0.0 // indirect
4862
github.com/json-iterator/go v1.1.12 // indirect
4963
github.com/mailru/easyjson v0.7.7 // indirect
5064
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
65+
github.com/moby/spdystream v0.2.0 // indirect
5166
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5267
github.com/modern-go/reflect2 v1.0.2 // indirect
5368
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
69+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5470
github.com/pkg/errors v0.9.1 // indirect
5571
github.com/prometheus/client_golang v1.18.0 // indirect
5672
github.com/prometheus/client_model v0.5.0 // indirect
5773
github.com/prometheus/common v0.45.0 // indirect
5874
github.com/prometheus/procfs v0.12.0 // indirect
5975
github.com/russross/blackfriday/v2 v2.1.0 // indirect
76+
github.com/spf13/cobra v1.8.0 // indirect
6077
github.com/spf13/pflag v1.0.5 // indirect
78+
github.com/stoewer/go-strcase v1.2.0 // indirect
6179
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
80+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
81+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
82+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
83+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
84+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
85+
go.opentelemetry.io/otel v1.19.0 // indirect
86+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
87+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
88+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
89+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
90+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
91+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
92+
go.uber.org/multierr v1.11.0 // indirect
93+
go.uber.org/zap v1.26.0 // indirect
6294
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
6395
golang.org/x/net v0.24.0 // indirect
6496
golang.org/x/oauth2 v0.13.0 // indirect
97+
golang.org/x/sync v0.7.0 // indirect
6598
golang.org/x/sys v0.21.0 // indirect
6699
golang.org/x/term v0.21.0 // indirect
67100
golang.org/x/text v0.16.0 // indirect
68101
golang.org/x/time v0.3.0 // indirect
69102
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
70103
google.golang.org/appengine v1.6.8 // indirect
104+
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
105+
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
106+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
107+
google.golang.org/grpc v1.60.1 // indirect
71108
gopkg.in/inf.v0 v0.9.1 // indirect
109+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
72110
gopkg.in/yaml.v2 v2.4.0 // indirect
111+
k8s.io/apiserver v0.30.2 // indirect
112+
k8s.io/component-base v0.30.2 // indirect
113+
k8s.io/kms v0.30.2 // indirect
73114
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
115+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
74116
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
75117
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
76118
)

0 commit comments

Comments
 (0)