Skip to content
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

Corral-packages maintenance for registries + rancher (rke1/rke2/k3s) #55

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Corral-packages maintenance for registries + rancher (rke1/rke2/k3s) #55

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77db3db
corral-packages enhancements for qa-task 1316 + 1327
Josh-Diamond Jul 18, 2024
bc4ed8e
Update rancher-airgap.yaml
Josh-Diamond Aug 16, 2024
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
11 changes: 1 addition & 10 deletions packages/aws/rancher-k3s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,5 @@ templates:
- k3s
- rancher
variables:
kubernetes_version:
- v1.26.8+k3s1
- v1.25.13+k3s1
- v1.24.17+k3s1
- v1.23.16+k3s1
rancher_version:
- 2.7.7
- 2.7.6
- 2.7.5
cert_manager_version:
- 1.8.0
- 1.15.0
8 changes: 1 addition & 7 deletions packages/aws/rancher-registry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,11 @@ templates:
variables:
cni:
- calico
kubernetes_version:
- v1.25.16+rke2r1
- v1.26.14+rke2r1
registry_auth:
- global
- enabled
- disabled
docker_compose_version:
- 2.18.1
rancher_version:
- 2.7.10
- 2.8.2
cert_manager_version:
- 1.11.0
- 1.15.0
12 changes: 1 addition & 11 deletions packages/aws/rancher-rke1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,5 @@ variables:
- true
cni:
- calico
kubernetes_version:
- v1.26.8-rancher1-1
- v1.25.13-rancher1-1
- v1.24.17-rancher1-1
- v1.23.16-rancher2-3
rancher_version:
- 2.7.8
- 2.7.7
- 2.7.6
- 2.7.5
cert_manager_version:
- 1.8.0
- 1.15.0
12 changes: 1 addition & 11 deletions packages/aws/rancher-rke2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,5 @@ templates:
variables:
cni:
- calico
kubernetes_version:
- v1.26.8+rke2r1
- v1.25.13+rke2r1
- v1.24.17+rke2r1
- v1.23.16+rke2r1
rancher_version:
- 2.7.7
- 2.7.6
- 2.7.5
- 2.6.12
cert_manager_version:
- 1.8.0
- 1.15.0
4 changes: 1 addition & 3 deletions packages/aws/registry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ variables:
- ecr
docker_compose_version:
- 2.18.1
rancher_version:
- 2.8.2
cert_manager_version:
- 1.11.0
- 1.15.0

1 change: 1 addition & 0 deletions templates/aws/registry_nodes/terraform/pools/corral.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ variable "aws_ssh_user" {}
variable "aws_security_group" {}
variable "aws_vpc" {}
variable "aws_subnet" {}
variable "aws_volume_size" {}
variable "install_docker" {}
variable "instance_type" {}
variable "airgap_setup" {}
2 changes: 1 addition & 1 deletion templates/aws/registry_nodes/terraform/pools/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource "aws_instance" "registry" {

ebs_block_device {
device_name = "/dev/sda1"
volume_size = "200"
volume_size = "${var.aws_volume_size}"
volume_type = "gp3"
encrypted = true
delete_on_termination = true
Expand Down
1 change: 1 addition & 0 deletions templates/k3s/overlay/opt/corral/k3s/init-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ config="write-kubeconfig-mode: 644
cluster-init: true
tls-san:
- ${CORRAL_api_host}
- ${CORRAL_kube_api_host}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just making sure, why is this being added as well?

"

mkdir -p /etc/rancher/k3s
Expand Down
8 changes: 4 additions & 4 deletions templates/registry-standalone/overlay/opt/corral/registry/registry-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,11 @@ else
echo "No suse registry defined; expecting rancher/rancher image to exist in registry"
else
docker pull "${CORRAL_suse_registry}/rancher/rancher:v${CORRAL_rancher_version}"
docker tag "${CORRAL_suse_registry}/rancher/rancher:v${CORRAL_rancher_version}" "${CORRAL_registry_fqdn}/rancher/rancher:v${CORRAL_rancher_version}"
docker push "${CORRAL_registry_fqdn}/rancher/rancher:v${CORRAL_rancher_version}"
docker tag "${CORRAL_suse_registry}/rancher/rancher:v${CORRAL_rancher_version}" "${CORRAL_registry_fqdn}/${CORRAL_suse_registry}/rancher/rancher:v${CORRAL_rancher_version}"
docker push "${CORRAL_registry_fqdn}/${CORRAL_suse_registry}/rancher/rancher:v${CORRAL_rancher_version}"
docker pull "${CORRAL_suse_registry}/rancher/rancher-agent:v${CORRAL_rancher_version}"
docker tag "${CORRAL_suse_registry}/rancher/rancher-agent:v${CORRAL_rancher_version}" "${CORRAL_registry_fqdn}/rancher/rancher-agent:v${CORRAL_rancher_version}"
docker push "${CORRAL_registry_fqdn}/rancher/rancher-agent:v${CORRAL_rancher_version}"
docker tag "${CORRAL_suse_registry}/rancher/rancher-agent:v${CORRAL_rancher_version}" "${CORRAL_registry_fqdn}/${CORRAL_suse_registry}/rancher/rancher-agent:v${CORRAL_rancher_version}"
docker push "${CORRAL_registry_fqdn}/${CORRAL_suse_registry}/rancher/rancher-agent:v${CORRAL_rancher_version}"
fi
fi

Expand Down
1 change: 1 addition & 0 deletions templates/rke2/overlay/opt/corral/rke2/init-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ config="write-kubeconfig-mode: 644
cni: ${CORRAL_cni}
tls-san:
- ${CORRAL_api_host}
- ${CORRAL_kube_api_host}
"

if [ "${CORRAL_registry_fqdn}" ]; then
Expand Down