Skip to content

Commit

Permalink
Upgrade cilium to v1.15.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Roman Hros <roman.hros@dnation.cloud>
  • Loading branch information
@chess-knight
chess-knight committed Feb 1, 2024
1 parent cde6227 commit 9707e15
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions doc/configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Parameters controlling the Cluster-API management server (capi management server
| `ssh_username` | | SCS | `ubuntu` | Name of the default user for the `image` |
| `clusterapi_version` | | SCS | `1.6.1` <!-- renovate: datasource=github-releases depName=kubernetes-sigs/cluster-api --> | Version of the cluster-API incl. `clusterctl` |
| `capi_openstack_version` | | SCS | `0.9.0` <!-- renovate: datasource=github-releases depName=kubernetes-sigs/cluster-api-provider-openstack --> | Version of the cluster-api-provider-openstack (needs to fit the CAPI version) |
| `cilium_binaries` | | SCS | `v0.15.7;v0.12.0` | Versions of the cilium and hubble CLI in the vA.B.C;vX.Y.Z format |
| `cilium_binaries` | | SCS | `v0.15.21;v0.13.0` | Versions of the cilium and hubble CLI in the vA.B.C;vX.Y.Z format |
| `restrict_mgmt_server` | | SCS | `["0.0.0.0/0"]` | Allows restricting access to the management server by the given list of CIDRs. Empty value (default) means public. |
| `mgmt_cidr` | | SCS | `10.0.0.0/24` | IPv4 address range (CIDR notation) for management cluster |
| `mgmt_ip_range` | | SCS | `{start:"10.0.0.11", end:"10.0.0.254"}` | IP range from defined `mgmt_cidr` variable for management cluster. It is recommended to reserve the first 10 IPs. |
Expand Down Expand Up @@ -51,7 +51,7 @@ Parameters controlling the cluster creation:
| `node_cidr` | `NODE_CIDR` | SCS | `10.8.0.0/20` | IPv4 address range (CIDR notation) for workload nodes |
| `pod_cidr` | `POD_CIDR` | SCS | `192.168.0.0/16` | IPv4 address range (CIDR notation) for pods |
| `service_cidr` | `SERVICE_CIDR` | SCS | `10.96.0.0/12` | IPv4 address range (CIDR notation) for services |
| `use_cilium` | `USE_CILIUM` | SCS | `true` | Use cilium as CNI instead of calico, it can be set to vX.Y.Z and `true` results in `v1.14.1`, also see `cilium_binaries` |
| `use_cilium` | `USE_CILIUM` | SCS | `true` | Use cilium as CNI instead of calico, it can be set to vX.Y.Z and `true` results in `v1.15.0`, also see `cilium_binaries` |
| `calico_version` | `CALICO_VERSION` | SCS | `v3.27.0` <!-- renovate: datasource=github-releases depName=projectcalico/calico --> | Version of the Calico CNI provider (ignored if `use_cilium` is set) |
| `kubernetes_version` | `KUBERNETES_VERSION` | capo | `v1.27.x` | Kubernetes version deployed into workload cluster (`.x` means latest patch release) |
| `` | `OPENSTACK_IMAGE_NAME` | capo | `ubuntu-capi-image-${KUBERNETES_VERION}` | Image name for k8s controller and worker nodes. Ubuntu 22.04 image is used for k8s versions >= 1.27.3, 1.26.6, 1.25.11, Ubuntu 20.04 otherwise. |
Expand Down
4 changes: 2 additions & 2 deletions doc/usage/gateway-api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Starting with R5, this k8s-solution offers experimental kubernetes gateway API s
After deploying your cluster, you can use gateway API and deploy Gateways and HTTP-Routes. As a starting point you can deploy this example app:

```bash
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.11/samples/bookinfo/platform/kube/bookinfo.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.14/samples/bookinfo/platform/kube/bookinfo.yaml
```
and this example Gateway and HTTP-Route
```bash
kubectl apply -f https://raw.githubusercontent.com/cilium/cilium/1.14.1/examples/kubernetes/gateway/basic-http.yaml
kubectl apply -f https://raw.githubusercontent.com/cilium/cilium/1.15.0/examples/kubernetes/gateway/basic-http.yaml
```
2 changes: 1 addition & 1 deletion terraform/environments/environment-default.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ssh_username = "<username_for_ssh>" # defaults to "ubuntu"
clusterapi_version = "<1.x.y>" # defaults to "1.5.1"
capi_openstack_version = "<0.x.y>" # defaults to "0.8.0"
image = "<glance_image>" # defaults to "Ubuntu 22.04"
cilium_binaries = "<v0.aa.bb;v0.xx.yy>" # defaults to "v0.15.7;v0.12.0"
cilium_binaries = "<v0.aa.bb;v0.xx.yy>" # defaults to "v0.15.21;v0.13.0"
mgmt_cidr = "<CIDR>" # defaults to "10.0.0.0/24"
mgmt_ip_range = {"start": "<start of the IP range>", "end": "<end of the IP range>"} # defaults to '{"start": "10.0.0.11", "end": "10.0.0.254"}'
# Settings for testcluster
Expand Down
13 changes: 7 additions & 6 deletions terraform/files/bin/create_cluster.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,15 @@ MTU_VALUE=$(yq eval '.MTU_VALUE' $CCCFG)
if test "$USE_CILIUM" = "true" -o "${USE_CILIUM:0:1}" = "v"; then
DEPLOY_GATEWAY_API=$(yq eval '.DEPLOY_GATEWAY_API == true' $CCCFG)
if test "${DEPLOY_GATEWAY_API}" = "true"; then
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v0.7.1/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v0.7.1/config/crd/standard/gateway.networking.k8s.io_gateways.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v0.7.1/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v0.7.1/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v0.7.1/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml
kubectl --context=$KCONTEXT apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml
fi
# FIXME: Do we need to allow overriding MTU here as well?
CILIUM_VERSION="v1.14.1"
CILIUM_VERSION="v1.15.0"
if test "${USE_CILIUM:0:1}" = "v"; then
CILIUM_VERSION="${USE_CILIUM}"
fi
Expand Down
2 changes: 1 addition & 1 deletion terraform/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ variable "use_cilium" {
variable "cilium_binaries" {
description = "cilium and hubble CLI versions in the vA.B.C;vX.Y.Z format"
type = string
default = "v0.15.7;v0.12.0"
default = "v0.15.21;v0.13.0"
}

variable "etcd_unsafe_fs" {
Expand Down

0 comments on commit 9707e15

Please sign in to comment.