Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bump golang version from 1.21 to 1.22 #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Bump golang version from 1.21 to 1.22 #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-generated-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'

- name: Run the automatic generation
working-directory: ./
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
cache: false

- name: golangci-lint
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'

- name: Execute go mod tidy and check the outcome
working-directory: ./
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ PROTOC=$(shell which protoc)
# download controller-gen if necessary
controller-gen:
ifeq (, $(shell which controller-gen))
@go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0
@go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
CONTROLLER_GEN=$(GOBIN)/controller-gen
else
CONTROLLER_GEN=$(shell which controller-gen)
Expand Down
2 changes: 1 addition & 1 deletion build/common/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 as builder
FROM golang:1.22 as builder
WORKDIR /tmp/builder

COPY go.mod ./go.mod
Expand Down
2 changes: 1 addition & 1 deletion build/liqo-test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 as builder
FROM golang:1.22 as builder
ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go
ENV K8S_VERSION=1.25.0
Expand Down
2 changes: 1 addition & 1 deletion build/liqoctl/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ error() {
}
trap 'error "${BASH_SOURCE}" "${LINENO}"' ERR

GO_VERSION="1.21"
GO_VERSION="1.22"

CGO_ENABLED="${CGO_ENABLED:-0}"
GOOS="${GOOS:-linux}"
Expand Down
4 changes: 2 additions & 2 deletions build/liqonet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.7 as goBuilder-wg
FROM golang:1.22.0 as goBuilder-wg

ARG VERSION=2e0774f246fb4fc1bd5cb44584d033038c89174e
# change with "go install git.zx2c4.com/wireguard-go"
Expand All @@ -8,7 +8,7 @@ WORKDIR /go/wireguard-go
RUN git checkout $VERSION
RUN CGO_ENABLED=0 make

FROM golang:1.21.7 as goBuilder
FROM golang:1.22.0 as goBuilder
WORKDIR /tmp/builder

COPY go.mod ./go.mod
Expand Down
36 changes: 21 additions & 15 deletions deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: foreignclusters.discovery.liqo.io
spec:
group: discovery.liqo.io
Expand Down Expand Up @@ -53,14 +53,19 @@ spec:
description: ForeignCluster is the Schema for the foreignclusters API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -86,9 +91,9 @@ spec:
pattern: https:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)
type: string
foreignProxyUrl:
description: URL where to contact foreign proxy for the api server.
This URL is used when creating the k8s clients toward the remote
cluster.
description: |-
URL where to contact foreign proxy for the api server. This URL is used when
creating the k8s clients toward the remote cluster.
type: string
incomingPeeringEnabled:
default: Auto
Expand Down Expand Up @@ -120,9 +125,9 @@ spec:
- InBand
type: string
ttl:
description: If discoveryType is LAN, this indicates the number of
seconds after that this ForeignCluster will be removed if no updates
have been received.
description: |-
If discoveryType is LAN, this indicates the number of seconds after that
this ForeignCluster will be removed if no updates have been received.
minimum: 0
type: integer
required:
Expand All @@ -135,8 +140,9 @@ spec:
description: URL of the forign cluster's API server.
type: string
peeringConditions:
description: PeeringConditions contains the conditions about the peering
related to this ForeignCluster.
description: |-
PeeringConditions contains the conditions about the peering related to this
ForeignCluster.
items:
description: PeeringCondition contains details about state of the
peering.
Expand Down
19 changes: 12 additions & 7 deletions deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: resourcerequests.discovery.liqo.io
spec:
group: discovery.liqo.io
Expand All @@ -29,14 +29,19 @@ spec:
description: ResourceRequest is the Schema for the ResourceRequests API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
43 changes: 25 additions & 18 deletions deployments/liqo/crds/net.liqo.io_ipamstorages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: ipamstorages.net.liqo.io
spec:
group: net.liqo.io
Expand All @@ -22,14 +22,19 @@ spec:
description: IpamStorage is the Schema for the ipams API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down Expand Up @@ -64,9 +69,9 @@ spec:
- remoteExternalCIDR
- remotePodCIDR
type: object
description: Map used to keep track of networks assigned to clusters.
Key is the remote cluster ID, value is a the set of networks used
by the remote cluster.
description: |-
Map used to keep track of networks assigned to clusters. Key is the remote cluster ID, value is a the set of
networks used by the remote cluster.
type: object
endpointMappings:
additionalProperties:
Expand Down Expand Up @@ -95,10 +100,10 @@ spec:
- ExternalCIDROriginalIP
- clusterMappings
type: object
description: Endpoint IP mappings. Key is the IP address of the local
endpoint, value is an EndpointMapping struct that contains the related
IP belonging to the ExternalCIDR and also the list of clusters on
which this mapping is active
description: |-
Endpoint IP mappings. Key is the IP address of the local endpoint, value is an EndpointMapping struct
that contains the related IP belonging to the ExternalCIDR and also the list of clusters
on which this mapping is active
type: object
externalCIDR:
description: Cluster ExternalCIDR
Expand All @@ -108,8 +113,9 @@ spec:
description: ConfiguredCluster is an empty struct used as value
for NatMappingsConfigured.
type: object
description: NatMappingsConfigured is a map that contains all the
remote clusters for which NatMappings have been already configured.
description: |-
NatMappingsConfigured is a map that contains all the remote clusters
for which NatMappings have been already configured.
Key is a cluster ID, value is an empty struct.
type: object
podCIDR:
Expand All @@ -124,9 +130,10 @@ spec:
additionalProperties:
format: byte
type: string
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
description: |-
INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file
Map consumed by go-ipam module. Key is prefic cidr, value is a Prefix.'
Map consumed by go-ipam module. Key is prefic cidr, value is a Prefix.
type: object
reservedSubnets:
description: Reserved Networks. Subnets listed in this field are excluded
Expand Down
30 changes: 18 additions & 12 deletions deployments/liqo/crds/net.liqo.io_natmappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: natmappings.net.liqo.io
spec:
group: net.liqo.io
Expand All @@ -22,14 +22,19 @@ spec:
description: NatMapping is the Schema for the natmappings API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -46,13 +51,14 @@ spec:
active.
type: object
externalCIDR:
description: ExternalCIDR is the ExternalCIDR used in the remote cluster
for local exported resource. It can be either the LocalExternalCIDR
or the LocalNATExternalCIDR.
description: |-
ExternalCIDR is the ExternalCIDR used in the remote cluster for local exported resource.
It can be either the LocalExternalCIDR or the LocalNATExternalCIDR.
type: string
podCIDR:
description: PodCIDR is the network used for remote pods in the local
cluster. It can be either the RemotePodCIDR or the RemoteNATPodCIDR.
description: |-
PodCIDR is the network used for remote pods in the local cluster.
It can be either the RemotePodCIDR or the RemoteNATPodCIDR.
type: string
required:
- clusterID
Expand Down
31 changes: 18 additions & 13 deletions deployments/liqo/crds/net.liqo.io_networkconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: networkconfigs.net.liqo.io
spec:
group: net.liqo.io
Expand Down Expand Up @@ -43,14 +43,19 @@ spec:
description: NetworkConfig is the Schema for the networkconfigs API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down Expand Up @@ -100,14 +105,14 @@ spec:
description: NetworkConfigStatus defines the observed state of NetworkConfig.
properties:
externalCIDRNAT:
description: The new subnet used to NAT the externalCIDR of the remote
cluster. The original ExternalCIDR may have been mapped to this
network by the remote cluster.
description: |-
The new subnet used to NAT the externalCIDR of the remote cluster. The original ExternalCIDR may have been mapped
to this network by the remote cluster.
type: string
podCIDRNAT:
description: The new subnet used to NAT the podCidr of the remote
cluster. The original PodCidr may have been mapped to this network
by the remote cluster.
description: |-
The new subnet used to NAT the podCidr of the remote cluster. The original PodCidr may have been mapped to this
network by the remote cluster.
type: string
processed:
default: false
Expand Down
Loading