diff --git a/DEPENDENCIES b/DEPENDENCIES index 4efd53e108..6f600492d8 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,63 +1,113 @@ core: - kind: - clusterctl: v1.5.3 - cluster-api: v1.5.3 - capi-kubeadm-bootstrap-system: v1.5.3 - capi-kubeadm-control-plane-system: v1.5.3 - cluster-operator: - cluster-operator-chart: v0.2.0-SNAPSHOT - cluster-operator: v0.2.0-SNAPSHOT - kube-rbac-proxy: v0.15.0 - calico: - calicoctl: v3.26.1 - tigera-operator: v1.30.5 - cluster-autoscaler-chart: v9.29.1 - cluster-autoscaler: v1.27.2 - pause: v3.9 + binaries: + clusterctl: v1.5.3 + helm: v3.13.1 + images: + calico: + cni: v3.26.1 + csi: v3.26.1 + ctl: v3.26.1 + kube-controllers: v3.26.1 + node-driver-registrar: v3.26.1 + node: v3.26.1 + pod2daemon-flexvol: v3.26.1 + typha: v3.26.1 + capi: + kubeadm-bootstrap-controller: v1.5.3 + kubeadm-control-plane-controller: v1.5.3 + cluster-api-controller: v1.5.3 + cert-manager: + cert-manager-acmesolver: v1.12.3 + cert-manager-cainjector: v1.12.3 + cert-manager-controller: v1.12.3 + cert-manager-ctl: v1.12.3 + cert-manager-webhook: v1.12.3 + cluster-autoscaler: v1.27.2 + cluster-operator: + cluster-operator: 0.3.6 + kube-rbac-proxy: v0.15.0 + kind: + kindnetd: v20221004-44d545d1 + node: v1.27.0 + stratio-capi-image: v1.27.0 + tigera: + operator: v1.30.5 + pause: v3.9 + charts: + cert-manager: v1.12.3 + cluster-autoscaler: v9.29.1 + cluster-operator: 0.3.6 aws: - clusterawsadm: v2.2.1 - cluster-api-aws: v2.2.1 - cluster-api-aws-templates: v2.2.1 + capa: + binaries: + clusterawsadm: v2.2.1 + images: + cluster-api-aws-controller: v2.2.1 + manifests: + metadata.yaml: v2.2.1 + infrastructure-components.yaml: v2.2.1 managed: - aws-load-balancer-controller:1.6.2 - eks-addons: + addons: aws-ebs-csi-driver: v1.29.1-eksbuild.1 coredns: v1.10.1-eksbuild.7 - kube-proxy: v1.24.15-eksbuild.2 # k8s 1.24-1.25 - kube-proxy: v1.26.7-eksbuild.2 # k8s 1.26-... + kube-proxy: v1.24.15-eksbuild.2 + kube-proxy: v1.26.7-eksbuild.2 vpc-cni: v1.27.10-eksbuild.2 + charts: + aws-load-balancer-controller: v2.6.2 + images: + aws-load-balancer-controller: v2.6.2 unmanaged: - aws-ebs-csi-driver-chart: v2.20.0 - aws-ebs-csi-driver: v2.20.0 - external-attacher: v4.3.0-eks-1-27-3 - external-provisioner: v3.5.0-eks-1-27-3 - external-resizer: v1.8.0-eks-1-27-3 - csi-snapshotter: v6.2.1-eks-1-27-3 - livenessprobe: v2.10.0-eks-1-27-3 - node-driver-registrar: v2.8.0-eks-1-27-3 - volume-modifier-for-k8s: v0.1.0 + charts: + aws-ebs-csi-driver: v2.20.0 + images: + aws-ebs-csi-driver: v1.20.0 + csi-snapshotter: v6.2.1-eks-1-27-3 + external-attacher: v4.3.0-eks-1-27-3 + external-provisioner: v3.5.0-eks-1-27-3 + external-resizer: v1.8.0-eks-1-27-3 + livenessprobe: v2.10.0-eks-1-27-3 + node-driver-registrar: v2.8.0-eks-1-27-3 + volume-modifier-for-k8s: v0.1.0 azure: - cluster-api-azure: v1.11.4 - cluster-api-azure-templates: v1.11.4 + capz: + images: + azureserviceoperator: v2.3.0 + cluster-api-azure-controller: v1.11.4 + kube-rbac-proxy: v0.13.1 + nmi: v1.8.14 + manifests: + metadata.yaml: v1.11.4 + infrastructure-components.yaml: v1.11.4 unmanaged: - cloud-provider-azure-chart: v1.28.5 - azure-cloud-controller-manager: v1.24.18 - azure-cloud-node-manager: v1.24.18 - azuredisk-csi-driver-chart: v1.28.7 - azuredisk-csi-driver: v1.28.7 - azurefile-csi-driver-chart: v1.28.7 - azurefile-csi-driver: v1.28.7 - csi-provisioner: v3.3.0 - csi-attacher: v4.0.0 - csi-snapshotter: v5.0.1 - csi-resizer: v1.6.0 - livenessprobe: v2.8.0 + charts: + azuredisk-csi-driver: v1.28.7 + azurefile-csi-driver: v1.28.7 + cloud-provider-azure: v1.28.5 + images: + azure-cloud-controller-manager: v1.28.1 + azure-cloud-node-manager: v1.28.1 + azuredisk-csi: v1.28.7 + azurefile-csi: v1.28.7 + csi-attacher: v4.3.0 + csi-node-driver-registrar: v2.8.0 + csi-provisioner: v3.5.0 + csi-resizer: v1.8.0 + csi-snapshotter: v6.2.1 + livenessprobe: v2.10.0 + snapshot-controller: v6.2.1 gcp: - cluster-api-gcp: v1.6.1 - cluster-api-gcp-templates: v1.6.1 - gcp-compute-persistent-disk-csi-driver: v1.10.1 - csi-node-driver-registrar: v2.7.0 - csi-snapshotter: v6.1.0 - csi-resizer: v1.7.0 - csi-attacher: v4.2.0 - csi-provisioner: v3.4.0 + capg: + images: + cluster-api-gcp-controller: 1.6.1-0.2.1 + manifests: + metadata.yaml: 1.6.1-0.2.1 + infrastructure-components.yaml: 1.6.1-0.2.1 + managed: + images: + csi-attacher: v4.2.0 + csi-node-driver-registrar: v2.7.0 + csi-provisioner: v3.4.0 + csi-resizer: v1.7.0 + csi-snapshotter: v6.1.0 + gcp-compute-persistent-disk-csi-driver: v1.10.1 diff --git a/Jenkinsfile b/Jenkinsfile index 194f382c25..1213782d12 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,7 @@ hose { doPackage(conf: config, parameters: "GOCACHE=/tmp") doDeploy(conf: config) doCustomStage(conf:config, buildToolOverride: [CUSTOM_COMMAND: 'mkdir -p CTS/resources; tar zxvf bin/cloud-provisioner.tar.gz -C CTS/resources/; chmod -R 0700 CTS/resources/bin/cloud-provisioner'], stageName: "Extract binary") + doDocker(conf: config, image:"stratio-capi-image", dockerfile: "pkg/cluster/internal/providers/docker/stratio/Dockerfile") doGrypeScan(conf: config, artifactsList: [[path: 'CTS/resources/bin/cloud-provisioner', name: 'cloud-provisioner']]) doAT(conf: config, buildToolOverride: ['BUILDTOOL_IMAGE': 'stratio/cloud-testing-suite:0.1.0-SNAPSHOT', 'BUILDTOOL_PRIVILEGED': true, 'BUILDTOOL_RUNASUSER': "0"], configFiles: [[fileId: "clouds-credentials.yaml", variable: "credentials"]], runOnPR: true) } diff --git a/bin/images/aws/imagenes-aws.txt b/bin/images/aws/imagenes-aws-cloud-controller-manager.txt similarity index 100% rename from bin/images/aws/imagenes-aws.txt rename to bin/images/aws/imagenes-aws-cloud-controller-manager.txt diff --git a/bin/images/aws/imagenes-aws-load-balancer-controller.txt b/bin/images/aws/imagenes-aws-load-balancer-controller.txt new file mode 100644 index 0000000000..10dfc512b9 --- /dev/null +++ b/bin/images/aws/imagenes-aws-load-balancer-controller.txt @@ -0,0 +1 @@ +public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2 diff --git a/bin/images/aws/imagenes-ebs-csi-driver.txt b/bin/images/aws/imagenes-ebs-csi-driver.txt index 73bb780790..897792be18 100644 --- a/bin/images/aws/imagenes-ebs-csi-driver.txt +++ b/bin/images/aws/imagenes-ebs-csi-driver.txt @@ -1 +1,8 @@ public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.20.0 +public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:v0.1.0 +public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.3.0-eks-1-27-3 +public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.5.0-eks-1-27-3 +public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.8.0-eks-1-27-3 +public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v6.2.1-eks-1-27-3 +public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.10.0-eks-1-27-3 +public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.8.0-eks-1-27-3 diff --git a/bin/images/aws/imagenes-eks-distro.txt b/bin/images/aws/imagenes-eks-distro.txt deleted file mode 100644 index 73c746d192..0000000000 --- a/bin/images/aws/imagenes-eks-distro.txt +++ /dev/null @@ -1,6 +0,0 @@ -public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.3.0-eks-1-27-3 -public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.8.0-eks-1-27-3 -public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.10.0-eks-1-27-3 -public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.8.0-eks-1-27-3 -public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.5.0-eks-1-27-3 -public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2 diff --git a/bin/images/azure/imagenes-csi-azure.txt b/bin/images/azure/imagenes-azuredisk-csi-driver.txt similarity index 60% rename from bin/images/azure/imagenes-csi-azure.txt rename to bin/images/azure/imagenes-azuredisk-csi-driver.txt index 3ed5b75584..6373f561d8 100644 --- a/bin/images/azure/imagenes-csi-azure.txt +++ b/bin/images/azure/imagenes-azuredisk-csi-driver.txt @@ -1,8 +1,8 @@ -mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.3 -mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.3 -mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0 -mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.8.0 -mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.1 -mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.2 +mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.7 mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v4.3.0 +mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0 mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.5.0 +mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.8.0 +mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.1 +mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0 +mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller:v6.2.1 diff --git a/bin/images/azure/imagenes-azurefile-csi-driver.txt b/bin/images/azure/imagenes-azurefile-csi-driver.txt new file mode 100644 index 0000000000..59e242fbd3 --- /dev/null +++ b/bin/images/azure/imagenes-azurefile-csi-driver.txt @@ -0,0 +1,8 @@ +mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.7 +mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v4.3.0 +mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0 +mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.5.0 +mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.8.0 +mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.1 +mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0 +mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller:v6.2.1 diff --git a/bin/images/azure/imagenes-capz.txt b/bin/images/azure/imagenes-capz.txt index d323c88595..f4614d83f1 100644 --- a/bin/images/azure/imagenes-capz.txt +++ b/bin/images/azure/imagenes-capz.txt @@ -1,3 +1,4 @@ -mcr.microsoft.com/oss/azure/aad-pod-identity/nmi:v1.8.14 -registry.k8s.io/cluster-api-azure/cluster-api-azure-controller:v1.11.4 +gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 mcr.microsoft.com/k8s/azureserviceoperator:v2.3.0 +mcr.microsoft.com/oss/azure/aad-pod-identity/nmi:v1.8.14 +registry.k8s.io/cluster-api-azure/cluster-api-azure-controller:v1.11.4 \ No newline at end of file diff --git a/bin/images/azure/imagenes-cloud-controller.txt b/bin/images/azure/imagenes-cloud-controller.txt deleted file mode 100644 index be925266ad..0000000000 --- a/bin/images/azure/imagenes-cloud-controller.txt +++ /dev/null @@ -1,2 +0,0 @@ -mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.24.22 -mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.26.14 \ No newline at end of file diff --git a/bin/images/azure/imagenes-cloud-node.txt b/bin/images/azure/imagenes-cloud-node.txt deleted file mode 100644 index 9e01bbdd3f..0000000000 --- a/bin/images/azure/imagenes-cloud-node.txt +++ /dev/null @@ -1,2 +0,0 @@ -mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.24.22 -mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.26.14 \ No newline at end of file diff --git a/bin/images/azure/imagenes-cloud-provider-azure.txt b/bin/images/azure/imagenes-cloud-provider-azure.txt new file mode 100644 index 0000000000..f0301cda1d --- /dev/null +++ b/bin/images/azure/imagenes-cloud-provider-azure.txt @@ -0,0 +1,2 @@ +mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.28.1 +mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.28.1 diff --git a/bin/images/azure/imagenes-csi-azuredisk-node.txt b/bin/images/azure/imagenes-csi-azuredisk-node.txt deleted file mode 100644 index eab07b6dd2..0000000000 --- a/bin/images/azure/imagenes-csi-azuredisk-node.txt +++ /dev/null @@ -1,3 +0,0 @@ -mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.3 -mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0 -mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0 diff --git a/bin/images/azure/imagenes-csi-azurefile-node.txt b/bin/images/azure/imagenes-csi-azurefile-node.txt deleted file mode 100644 index 6ccec9ecf7..0000000000 --- a/bin/images/azure/imagenes-csi-azurefile-node.txt +++ /dev/null @@ -1,3 +0,0 @@ -mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.3 -mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0 -mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0 diff --git a/bin/images/commons/imagenes-calico.txt b/bin/images/commons/imagenes-calico.txt index 2088b5903f..175722ba8a 100644 --- a/bin/images/commons/imagenes-calico.txt +++ b/bin/images/commons/imagenes-calico.txt @@ -1,8 +1,8 @@ -docker.io/calico/kube-controllers:v3.26.1 -docker.io/calico/typha:v3.26.1 -docker.io/calico/node:v3.26.1 -docker.io/calico/csi:v3.26.1 -docker.io/calico/node-driver-registrar:v3.26.1 -docker.io/calico/ctl:v3.26.1 -docker.io/calico/cni:v3.26.1 -docker.io/calico/pod2daemon-flexvol:v3.26.1 +quay.io/calico/cni:v3.26.1 +quay.io/calico/csi:v3.26.1 +quay.io/calico/ctl:v3.26.1 +quay.io/calico/kube-controllers:v3.26.1 +quay.io/calico/node-driver-registrar:v3.26.1 +quay.io/calico/node:v3.26.1 +quay.io/calico/pod2daemon-flexvol:v3.26.1 +quay.io/calico/typha:v3.26.1 diff --git a/bin/images/commons/imagenes-cert-manager.txt b/bin/images/commons/imagenes-cert-manager.txt index 9e71989be7..eef4c797c7 100644 --- a/bin/images/commons/imagenes-cert-manager.txt +++ b/bin/images/commons/imagenes-cert-manager.txt @@ -1,10 +1,5 @@ -quay.io/jetstack/cert-manager-controller:v1.12.3 -quay.io/jetstack/cert-manager-cainjector:v1.12.3 -quay.io/jetstack/cert-manager-webhook:v1.12.3 quay.io/jetstack/cert-manager-acmesolver:v1.12.3 +quay.io/jetstack/cert-manager-cainjector:v1.12.3 +quay.io/jetstack/cert-manager-controller:v1.12.3 quay.io/jetstack/cert-manager-ctl:v1.12.3 -quay.io/jetstack/cert-manager-controller:v1.13.1 -quay.io/jetstack/cert-manager-cainjector:v1.13.1 -quay.io/jetstack/cert-manager-webhook:v1.13.1 -quay.io/jetstack/cert-manager-acmesolver:v1.13.1 -quay.io/jetstack/cert-manager-ctl:v1.13.1 \ No newline at end of file +quay.io/jetstack/cert-manager-webhook:v1.12.3 diff --git a/bin/images/commons/imagenes-cluster-operator.txt b/bin/images/commons/imagenes-cluster-operator.txt new file mode 100644 index 0000000000..f71930b844 --- /dev/null +++ b/bin/images/commons/imagenes-cluster-operator.txt @@ -0,0 +1,2 @@ +gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0 +stratio-releases.repo.stratio.com/stratio/cluster-operator:0.3.6 diff --git a/bin/images/commons/imagenes-commons.txt b/bin/images/commons/imagenes-commons.txt deleted file mode 100644 index 8dd45617d4..0000000000 --- a/bin/images/commons/imagenes-commons.txt +++ /dev/null @@ -1,2 +0,0 @@ -gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 -qa.int.stratio.com/stratio/cluster-operator:0.2.0-SNAPSHOT diff --git a/bin/images/commons/imagenes-kind.txt b/bin/images/commons/imagenes-kind.txt index 23f5e33158..087b1e7eed 100644 --- a/bin/images/commons/imagenes-kind.txt +++ b/bin/images/commons/imagenes-kind.txt @@ -1 +1,3 @@ +docker.io/kindest/kindnetd:v20221004-44d545d1 docker.io/kindest/node:v1.27.0 +stratio-releases.repo.stratio.com/stratio/stratio-capi-image:0.17.0-0.5.8 diff --git a/bin/images/commons/imagenes-tigera.txt b/bin/images/commons/tigera-operator.txt similarity index 100% rename from bin/images/commons/imagenes-tigera.txt rename to bin/images/commons/tigera-operator.txt diff --git a/bin/images/gcp/imagenes-capg.txt b/bin/images/gcp/imagenes-capg.txt index b412ea580a..446d5c4085 100644 --- a/bin/images/gcp/imagenes-capg.txt +++ b/bin/images/gcp/imagenes-capg.txt @@ -1 +1 @@ -registry.k8s.io/cluster-api-gcp/cluster-api-gcp-controller:v1.4.0@sha256:742ebf999137f4ab83c83b408793e2c97a1311adebe3b0c0e7e7317a122f26df +stratio-releases.repo.stratio.com/stratio/cluster-api-gcp-controller:1.6.1-0.2.1 \ No newline at end of file diff --git a/bin/images/gcp/imagenes-csi-node.txt b/bin/images/gcp/imagenes-csi-node.txt deleted file mode 100644 index e393fed5a3..0000000000 --- a/bin/images/gcp/imagenes-csi-node.txt +++ /dev/null @@ -1,2 +0,0 @@ -docker.io/calico/csi:v3.26.1 -docker.io/calico/node-driver-registrar:v3.26.1 diff --git a/bin/images/gcp/imagenes-csi-gce.txt b/bin/images/gcp/imagenes-gcp-compute-persistent-disk-csi-driver.txt similarity index 80% rename from bin/images/gcp/imagenes-csi-gce.txt rename to bin/images/gcp/imagenes-gcp-compute-persistent-disk-csi-driver.txt index 9b523ed778..f478d21b04 100644 --- a/bin/images/gcp/imagenes-csi-gce.txt +++ b/bin/images/gcp/imagenes-gcp-compute-persistent-disk-csi-driver.txt @@ -1,7 +1,6 @@ -registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0 registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.10.1 -registry.k8s.io/sig-storage/csi-provisioner:v3.4.0 registry.k8s.io/sig-storage/csi-attacher:v4.2.0 +registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0 +registry.k8s.io/sig-storage/csi-provisioner:v3.4.0 registry.k8s.io/sig-storage/csi-resizer:v1.7.0 registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0 -registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.10.1 diff --git a/docs/GCP/GKE Bastion.md b/docs/GCP/GKE Bastion.md index c915931e98..bf1546eaba 100644 --- a/docs/GCP/GKE Bastion.md +++ b/docs/GCP/GKE Bastion.md @@ -124,11 +124,11 @@ sudo gsutil cp gs://gke-vm-base-bastion/resources/autoscaler-trigger-deployment. gcloud auth configure-docker europe-docker.pkg.dev # Pull images -sudo docker pull europe-docker.pkg.dev/clusterapi-369611/keos/stratio-capi-image:v1.27.0 +sudo docker pull stratio-releases.repo.stratio.com/stratio/stratio-capi-image:0.17.0-0.5.8 # Tag image to stratio-capi-image:v1.27.0 -sudo docker tag europe-docker.pkg.dev/clusterapi-369611/keos/stratio-capi-image:v1.27.0 stratio-capi-image:v1.27.0 +sudo docker tag stratio-releases.repo.stratio.com/stratio/stratio-capi-image:0.17.0-0.5.8 stratio-capi-image:v1.27.0 # Add CLOUDSDK_PYTHON_SITEPACKAGES=1 to .bashrc and .profile (avoid numpy issues) echo 'export CLOUDSDK_PYTHON_SITEPACKAGES=1' >> ~/.bashrc diff --git a/pkg/cluster/internal/providers/docker/stratio/Dockerfile b/pkg/cluster/internal/providers/docker/stratio/Dockerfile index 269dd4672e..6f4c9403ac 100644 --- a/pkg/cluster/internal/providers/docker/stratio/Dockerfile +++ b/pkg/cluster/internal/providers/docker/stratio/Dockerfile @@ -1,6 +1,5 @@ -ARG DOCKER_REG=docker.io ARG IMAGE_VERSION=v1.27.0 -FROM ${DOCKER_REG}/kindest/node:${IMAGE_VERSION} +FROM kindest/node:${IMAGE_VERSION} # Init feature gates ENV CLUSTER_TOPOLOGY=true @@ -31,10 +30,16 @@ ENV CAPG=v1.6.1 ENV CAPZ=v1.11.4 ENV CAPG_FORK_URL="https://github.com/Stratio/cluster-api-provider-gcp/releases/download/1.6.1-0.2.1/" -# Install vim -RUN apt-get update && apt-get install -y \ - vim python3-pip git \ - && rm -rf /var/lib/apt/lists/* +# Install and update dependencies +RUN apt-get update \ + && apt-get install -y curl \ + git \ + libc-bin \ + libnghttp2-14 \ + python3-pip \ + vim \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* # Add aliases RUN echo 'alias k="kubectl"' >> ~/.bash_aliases \