Merge pull request #171 from devhindo/master

Upgrade Meshery Cilium Go version to 1.23

.github/workflows/build-and-release.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.21
+        go-version: 1.23
     - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build .
   docker:
     name: Docker build and push

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.23
       - uses: actions/checkout@master
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
@@ -42,7 +42,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.23
       - run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/kisielk/errcheck@latest; /home/runner/go/bin/errcheck -tags draft ./...
   error_code_check:
     name: Error code utility check
@@ -55,7 +55,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.23
       - run: |
             errWillHave="level=error"
             GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/layer5io/meshkit/cmd/errorutil;
@@ -77,7 +77,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.23
       - uses: dominikh/staticcheck-action@v1.2.0
         with:
           install-go: false
@@ -93,7 +93,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.23
       - run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go vet -tags draft ./...
   sec_check:
     name: Security check
@@ -123,7 +123,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v4
        with:
-        go-version: 1.21
+        go-version: 1.23
      - name: Create cluster using KinD
        uses: engineerd/setup-kind@v0.5.0
        with:

.github/workflows/component-generator.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.23
       - name: Run adapter to create components
         run: |
           touch log.txt

.github/workflows/error-ref-publisher.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.23
 
       - name: Run utility
         run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 as build-env
+FROM golang:1.23 as build-env
 ARG VERSION
 ARG GIT_COMMITSHA
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/layer5io/meshery-cilium
 
-go 1.19
+go 1.23
 
 replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334
 

main.go

@@ -54,7 +54,6 @@ func main() {
 	// Initialize Logger instance
 	log, err := logger.New(serviceName, logger.Options{
 		Format:     logger.SyslogLogFormat,
-		DebugLevel: isDebug(),
 	})
 	if err != nil {
 		fmt.Println(err)

templates/meshmodel/components/v1.17.0-pre.3/ciliumexternalworkload.meshery.layer5.io_meshmodel.json

@@ -0,0 +1 @@
+{"kind":"CiliumExternalWorkload","apiVersion":"cilium.io/v2","displayName":"Cilium External Workload","format":"JSON","hostname":"","hostID":"00000000-0000-0000-0000-000000000000","displayhostname":"","metadata":{"logoURL":"https://github.com/cncf/artwork/blob/master/projects/cilium/icon/white/cilium_icon-white.svg?short_path=d2fbc08","primaryColor":"#6B91C7","secondaryColor":"#9AB0CF","shape":"circle","svgColor":"\u003csvg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"\u003e\u003cdefs\u003e\u003cstyle\u003e.cls-1{fill:#cbdd72;}.cls-2{fill:#98ca3f;}.cls-3{fill:#6389c6;}.cls-4{fill:#e8282b;}.cls-5{fill:#f8c519;}.cls-6{fill:#f07525;}.cls-7{fill:#8162aa;}.cls-8{fill:#373737;}\u003c/style\u003e\u003c/defs\u003e\u003cpath class=\"cls-1\" d=\"M40.53139,62.5952h44.7715l22.38575,38.83793L85.30289,140.27106H40.53139L18.14564,101.43313Z\"/\u003e\u003cpath class=\"cls-2\" d=\"M40.53139,162.3871h44.7715l22.38575,38.56822L85.30289,239.52354H40.53139L18.14564,200.95532Z\"/\u003e\u003cpath class=\"cls-3\" d=\"M127.91673,211.47393h44.7715L195.074,250.04215l-22.38575,38.56822h-44.7715L105.531,250.04215Z\"/\u003e\u003cpath class=\"cls-4\" d=\"M127.91673,111.682h44.7715L195.074,150.52l-22.38575,38.83792h-44.7715L105.531,150.52Z\"/\u003e\u003cpath class=\"cls-5\" d=\"M127.91673,12.42954h44.7715L195.074,50.99776,172.68823,89.566h-44.7715L105.531,50.99776Z\"/\u003e\u003cpath class=\"cls-6\" d=\"M214.6278,62.5952h45.58062l22.79032,38.83793-22.79032,38.83793H214.6278l-22.79031-38.83793Z\"/\u003e\u003cpath class=\"cls-7\" d=\"M214.6278,162.3871h45.58062l22.79032,38.56822-22.79032,38.56822H214.6278l-22.79031-38.56822Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/\u003e\u003c/svg\u003e","svgWhite":"\u003csvg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"\u003e\u003cdefs\u003e\u003cstyle\u003e.cls-1{fill:#fff;}\u003c/style\u003e\u003c/defs\u003e\u003cpath class=\"cls-1\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/\u003e\u003c/svg\u003e"},"model":{"name":"cilium_service_mesh","version":"v1.17.0-pre.3","displayName":"CILIUM_SERVICE_MESH","hostname":"","hostID":"00000000-0000-0000-0000-000000000000","displayhostname":"","category":{"name":"Cloud Native Network","metadata":null},"metadata":{"logoURL":"https://github.com/cncf/artwork/blob/master/projects/cilium/icon/white/cilium_icon-white.svg?short_path=d2fbc08","primaryColor":"#6B91C7","secondaryColor":"#9AB0CF","shape":"circle","svgColor":"\u003csvg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"\u003e\u003cdefs\u003e\u003cstyle\u003e.cls-1{fill:#cbdd72;}.cls-2{fill:#98ca3f;}.cls-3{fill:#6389c6;}.cls-4{fill:#e8282b;}.cls-5{fill:#f8c519;}.cls-6{fill:#f07525;}.cls-7{fill:#8162aa;}.cls-8{fill:#373737;}\u003c/style\u003e\u003c/defs\u003e\u003cpath class=\"cls-1\" d=\"M40.53139,62.5952h44.7715l22.38575,38.83793L85.30289,140.27106H40.53139L18.14564,101.43313Z\"/\u003e\u003cpath class=\"cls-2\" d=\"M40.53139,162.3871h44.7715l22.38575,38.56822L85.30289,239.52354H40.53139L18.14564,200.95532Z\"/\u003e\u003cpath class=\"cls-3\" d=\"M127.91673,211.47393h44.7715L195.074,250.04215l-22.38575,38.56822h-44.7715L105.531,250.04215Z\"/\u003e\u003cpath class=\"cls-4\" d=\"M127.91673,111.682h44.7715L195.074,150.52l-22.38575,38.83792h-44.7715L105.531,150.52Z\"/\u003e\u003cpath class=\"cls-5\" d=\"M127.91673,12.42954h44.7715L195.074,50.99776,172.68823,89.566h-44.7715L105.531,50.99776Z\"/\u003e\u003cpath class=\"cls-6\" d=\"M214.6278,62.5952h45.58062l22.79032,38.83793-22.79032,38.83793H214.6278l-22.79031-38.83793Z\"/\u003e\u003cpath class=\"cls-7\" d=\"M214.6278,162.3871h45.58062l22.79032,38.56822-22.79032,38.56822H214.6278l-22.79031-38.56822Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/\u003e\u003cpath class=\"cls-8\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/\u003e\u003c/svg\u003e","svgWhite":"\u003csvg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"\u003e\u003cdefs\u003e\u003cstyle\u003e.cls-1{fill:#fff;}\u003c/style\u003e\u003c/defs\u003e\u003cpath class=\"cls-1\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/\u003e\u003cpath class=\"cls-1\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/\u003e\u003c/svg\u003e"},"components":null,"relationships":null},"schema":"{\n \"description\": \"CiliumExternalWorkload is a Kubernetes Custom Resource that\\ncontains a specification for an external workload that can join the\\ncluster.  The name of the CRD is the FQDN of the external workload,\\nand it needs to match the name in the workload registration. The\\nlabels on the CRD object are the labels that will be used to\\nallocate a Cilium Identity for the external workload. If\\n'io.kubernetes.pod.namespace' or 'io.kubernetes.pod.name' labels\\nare not explicitly specified, they will be defaulted to 'default'\\nand \\u003cworkload name\\u003e, respectively. 'io.cilium.k8s.policy.cluster'\\nwill always be defined as the name of the current cluster, which\\ndefaults to \\\"default\\\".\",\n \"properties\": {\n  \"apiVersion\": {\n   \"description\": \"APIVersion defines the versioned schema of this representation of an object.\\nServers should convert recognized schemas to the latest internal value, and\\nmay reject unrecognized values.\\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources\",\n   \"type\": \"string\"\n  },\n  \"kind\": {\n   \"description\": \"Kind is a string value representing the REST resource this object represents.\\nServers may infer this from the endpoint the client submits requests to.\\nCannot be updated.\\nIn CamelCase.\\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds\",\n   \"type\": \"string\"\n  },\n  \"metadata\": {\n   \"type\": \"object\"\n  },\n  \"spec\": {\n   \"description\": \"Spec is the desired configuration of the external Cilium workload.\",\n   \"properties\": {\n    \"ipv4-alloc-cidr\": {\n     \"description\": \"IPv4AllocCIDR is the range of IPv4 addresses in the CIDR format that the external workload can\\nuse to allocate IP addresses for the tunnel device and the health endpoint.\",\n     \"pattern\": \"^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\/([0-9]|[1-2][0-9]|3[0-2])$\",\n     \"type\": \"string\"\n    },\n    \"ipv6-alloc-cidr\": {\n     \"description\": \"IPv6AllocCIDR is the range of IPv6 addresses in the CIDR format that the external workload can\\nuse to allocate IP addresses for the tunnel device and the health endpoint.\",\n     \"pattern\": \"^s*((([0-9A-Fa-f]{1,4}:){7}(:|([0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){6}:([0-9A-Fa-f]{1,4})?)|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){0,1}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){0,2}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){0,3}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){0,4}):([0-9A-Fa-f]{1,4})?))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){0,5}):([0-9A-Fa-f]{1,4})?))|(:(:|((:[0-9A-Fa-f]{1,4}){1,7}))))(%.+)?s*/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$\",\n     \"type\": \"string\"\n    }\n   },\n   \"type\": \"object\"\n  },\n  \"status\": {\n   \"description\": \"Status is the most recent status of the external Cilium workload.\\nIt is a read-only field.\",\n   \"properties\": {\n    \"id\": {\n     \"description\": \"ID is the numeric identity allocated for the external workload.\",\n     \"format\": \"int64\",\n     \"type\": \"integer\"\n    },\n    \"ip\": {\n     \"description\": \"IP is the IP address of the workload. Empty if the workload has not registered.\",\n     \"type\": \"string\"\n    }\n   },\n   \"type\": \"object\"\n  }\n },\n \"required\": [\n  \"metadata\"\n ],\n \"title\": \"Cilium External Workload\",\n \"type\": \"object\"\n}"}