alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

fix: oracle integration fixes

Browse Source 
* Set static gateway IPv6 if it possible.
  Some cni do not work properly with ipv6, so we will fix it.
* Disable talos dashboard.

Signed-off-by: Serge Logvinov <serge.logvinov@sinextra.dev>
Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Serge Logvinov 2023-10-07 15:11:48 +00:00 committed by Andrey Smirnov
parent 675bada454
commit 0ff7350abe
No known key found for this signature in database
GPG Key ID: FE042E3D4085A811
6 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
internal/app/machined/pkg/runtime/v1alpha1/platform/oracle/oracle.go
View File

@ -17,23 +17,26 @@ import (
"github.com/cosi-project/runtime/pkg/state"
"github.com/siderolabs/go-procfs/procfs"
networkctrl "github.com/siderolabs/talos/internal/app/machined/pkg/controllers/network"
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime"
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/platform/errors"
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/platform/internal/netutils"
"github.com/siderolabs/talos/pkg/download"
"github.com/siderolabs/talos/pkg/machinery/constants"
"github.com/siderolabs/talos/pkg/machinery/nethelpers"
"github.com/siderolabs/talos/pkg/machinery/resources/network"
runtimeres "github.com/siderolabs/talos/pkg/machinery/resources/runtime"
)
// NetworkConfig holds network interface meta config.
type NetworkConfig struct {
HWAddr string `json:"macAddr"`
PrivateIP string `json:"privateIp"`
VirtualRouterIP string `json:"virtualRouterIp"`
SubnetCidrBlock string `json:"subnetCidrBlock"`
Ipv6SubnetCidrBlock string `json:"ipv6SubnetCidrBlock,omitempty"`
Ipv6VirtualRouterIP string `json:"ipv6VirtualRouterIp,omitempty"`
HWAddr string `json:"macAddr"`
PrivateIP string `json:"privateIp"`
VirtualRouterIP string `json:"virtualRouterIp"`
SubnetCidrBlock string `json:"subnetCidrBlock"`
Ipv6SubnetCidrBlock string `json:"ipv6SubnetCidrBlock,omitempty"`
Ipv6VirtualRouterIP string `json:"ipv6VirtualRouterIp,omitempty"`
Ipv6Addresses []string `json:"ipv6Addresses,omitempty"`
}
// Oracle is the concrete type that implements the platform.Platform interface.
@ -61,18 +64,38 @@ func (o *Oracle) ParseMetadata(interfaceAddresses []NetworkConfig, metadata *Met
}
for idx, iface := range interfaceAddresses {
ipv6 := iface.Ipv6SubnetCidrBlock != "" && iface.Ipv6VirtualRouterIP != ""
ifname := fmt.Sprintf("eth%d", idx)
if ipv6 {
if iface.Ipv6SubnetCidrBlock != "" && iface.Ipv6VirtualRouterIP != "" {
networkConfig.Operators = append(networkConfig.Operators, network.OperatorSpecSpec{
Operator: network.OperatorDHCP6,
LinkName: fmt.Sprintf("eth%d", idx),
LinkName: ifname,
RequireUp: true,
DHCP6: network.DHCP6OperatorSpec{
RouteMetric: 1024,
RouteMetric: networkctrl.DefaultRouteMetric,
},
ConfigLayer: network.ConfigPlatform,
})
gw, err := netip.ParseAddr(iface.Ipv6VirtualRouterIP)
if err != nil {
return nil, err
}
route := network.RouteSpecSpec{
ConfigLayer: network.ConfigPlatform,
Gateway: gw,
OutLinkName: ifname,
Table: nethelpers.TableMain,
Protocol: nethelpers.ProtocolStatic,
Type: nethelpers.TypeUnicast,
Family: nethelpers.FamilyInet6,
Priority: 2 * networkctrl.DefaultRouteMetric,
}
route.Normalize()
networkConfig.Routes = append(networkConfig.Routes, route)
}
}
@ -141,6 +164,7 @@ func (o *Oracle) KernelArgs() procfs.Parameters {
return []*procfs.Parameter{
procfs.NewParameter("console").Append("tty1").Append("ttyS0"),
procfs.NewParameter(constants.KernelParamNetIfnames).Append("0"),
procfs.NewParameter(constants.KernelParamDashboardDisabled).Append("1"),
}
}

14
internal/app/machined/pkg/runtime/v1alpha1/platform/oracle/testdata/expected.yaml vendored
View File

@ -1,6 +1,18 @@
addresses: []
links: []
routes: []
routes:
- family: inet6
dst: ""
src: ""
gateway: fe80::a:b:c:d
outLinkName: eth0
table: main
priority: 2048
scope: global
type: unicast
flags: ""
protocol: static
layer: platform
hostnames:
- hostname: talos
domainname: ""

5
internal/app/machined/pkg/runtime/v1alpha1/platform/oracle/testdata/metadatanetwork.json vendored
View File

@ -7,6 +7,9 @@
"virtualRouterIp": "172.16.1.1",
"subnetCidrBlock": "172.16.1.0/24",
"ipv6SubnetCidrBlock": "2603:a:b:c::/64",
"ipv6VirtualRouterIp": "fe80::a:b:c:d"
"ipv6VirtualRouterIp": "fe80::a:b:c:d",
"ipv6Addresses": [
"2603:a:b:c::1234"
]
}
]

4
website/content/v1.4/talos-guides/install/cloud-platforms/oracle.md
View File

@ -1,7 +1,7 @@
---
title: "Oracle"
description: "Creating a cluster via the CLI (oci) on OracleCloud.com."
aliases:
aliases:
- ../../../cloud-platforms/oracle
---
@ -70,7 +70,7 @@ cat <<EOF > controlplane-health-checker.json
"intervalInMillis": 10000,
"port": 6443,
"protocol": "HTTPS",
"returnCode": 200,
"returnCode": 401,
"urlPath": "/readyz"
}
EOF

4
website/content/v1.5/talos-guides/install/cloud-platforms/oracle.md
View File

@ -1,7 +1,7 @@
---
title: "Oracle"
description: "Creating a cluster via the CLI (oci) on OracleCloud.com."
aliases:
aliases:
- ../../../cloud-platforms/oracle
---
@ -70,7 +70,7 @@ cat <<EOF > controlplane-health-checker.json
"intervalInMillis": 10000,
"port": 6443,
"protocol": "HTTPS",
"returnCode": 200,
"returnCode": 401,
"urlPath": "/readyz"
}
EOF

4
website/content/v1.6/talos-guides/install/cloud-platforms/oracle.md
View File

@ -1,7 +1,7 @@
---
title: "Oracle"
description: "Creating a cluster via the CLI (oci) on OracleCloud.com."
aliases:
aliases:
- ../../../cloud-platforms/oracle
---
@ -70,7 +70,7 @@ cat <<EOF > controlplane-health-checker.json
"intervalInMillis": 10000,
"port": 6443,
"protocol": "HTTPS",
"returnCode": 200,
"returnCode": 401,
"urlPath": "/readyz"
}
EOF