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.

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

Fix taints conditions #5

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
646d232
fixed descriptro credentials removing
lreciomelero Mar 27, 2023
55e9a25
Merge pull request #78 from lreciomelero/feature/EOS-11127_fix_creden…
lreciomelero Mar 27, 2023
9e2a2df
Minor Fixes
stg-0 Mar 27, 2023
6635b95
Merge branch 'branch-0.17.0-0.1' into minor-fixes
stg-0 Mar 27, 2023
373a26c
fix zones
stg-0 Mar 27, 2023
2a4107b
bastion ssh_key
stg-0 Mar 27, 2023
b3d0f24
fixed PR
lreciomelero Mar 28, 2023
e727025
Merge pull request #1 from lreciomelero/fix/PR79
stg-0 Mar 28, 2023
f915d2a
Merge pull request #79 from stg-0/minor-fixes
stg-0 Mar 28, 2023
18fe485
fix/node_image required condition
stg-0 Mar 28, 2023
f0fdd2e
Merge pull request #81 from stg-0/minor-fixes
stg-0 Mar 29, 2023
626d833
Add retries retrieving kubeconfig
kahun Mar 30, 2023
653cbaa
Add new control plane wait condition
kahun Mar 30, 2023
66a6114
Merge pull request #83 from kahun/fix/eks_get_kubeconfig
stg-0 Mar 30, 2023
1bb9d31
[BUILD] 0.17.0-0.1.0: New pre-release
stratiocommit Mar 30, 2023
b01acec
Prepare for next version: 0.17.0-0.1.0-SNAPSHOT
stratiocommit Mar 30, 2023
66418aa
Bump to CAPA release
stg-0 Mar 31, 2023
938730c
Merge branch 'branch-0.17.0-0.1' into bump-capa
stg-0 Mar 31, 2023
d992f76
Merge pull request #85 from stg-0/bump-capa
stg-0 Mar 31, 2023
d685500
[BUILD] 0.17.0-0.1.0: New pre-release
stratiocommit Mar 31, 2023
2fcd35e
Merge tag 'tags/0.17.0-0.1.0' into feature/merge_0.1.0
kahun Apr 3, 2023
7461541
aligning branch-0.17.0-0.1 cicd with branch-0.17.0-0.2
lreciomelero Apr 4, 2023
c6778c2
Merge pull request #90 from lreciomelero/chore/update_cicd_scripts
lreciomelero Apr 4, 2023
314132b
Fix deploy_tigera_operator in keos.yaml
kahun Apr 11, 2023
e006c35
chore: handle keos domain parameter
esierra-stratio Apr 11, 2023
2662dca
Versions Upgrade
iamjanr Apr 13, 2023
8516c65
Add docs Folder
iamjanr Apr 13, 2023
57b47f6
Fix gcp containerd config
kahun Apr 17, 2023
11838cf
Add pause dependency
kahun Apr 17, 2023
b89cdf2
Merge remote-tracking branch 'stratio/branch-0.17.0-0.2' into feature…
kahun Apr 17, 2023
514d41c
Merge pull request #86 from kahun/feature/merge_0.1.0
kahun Apr 17, 2023
19fd5f3
Merge remote-tracking branch 'stratio/branch-0.17.0-0.2' into fix/gcp…
kahun Apr 17, 2023
d21ff3c
Merge remote-tracking branch 'stratio/branch-0.17.0-0.2' into fix/dep…
kahun Apr 17, 2023
df3006c
Merge pull request #92 from kahun/fix/deploy_tigera_operator
kahun Apr 17, 2023
e6d77f0
Merge remote-tracking branch 'upstream/branch-0.17.0-0.2' into EOS-11162
iamjanr Apr 17, 2023
bbdc386
Merge remote-tracking branch 'stratio/branch-0.17.0-0.2' into fix/gcp…
kahun Apr 17, 2023
befc8df
Merge pull request #96 from kahun/fix/gcp_template
kahun Apr 17, 2023
609df9b
Merge remote-tracking branch 'upstream/branch-0.17.0-0.2' into EOS-11162
iamjanr Apr 17, 2023
7a2e78b
Merge branch 'branch-0.17.0-0.2' into chore/keos_domain_parameter_upport
esierra-stratio Apr 19, 2023
6d52936
Merge pull request #94 from esierra-stratio/chore/keos_domain_paramet…
esierra-stratio Apr 19, 2023
8fda06f
Merge remote-tracking branch 'upstream/branch-0.17.0-0.2' into EOS-11162
iamjanr Apr 20, 2023
db8bcef
Merge pull request #95 from iamjanr/EOS-11162
iamjanr Apr 20, 2023
feb2042
Merge remote-tracking branch 'stratio/branch-0.17.0-0.2' into fix/taints
kahun Apr 21, 2023
f2e680d
Fix taints conditions
kahun Apr 21, 2023
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# build and test outputs
/bin/
/_output/
/_artifacts/

Expand All @@ -21,7 +20,10 @@
*.sublime-workspace
*~

/bin/.gimme
/bin/cloud-provisioner*
deploy-recorder.lst
/hack/go
/hack/pkg
/hack/*.tar.gz
deploy-recorder.lst
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 0.17.0-0.1.0 (2023-03-26)
## 0.17.0-0.1.0 (2023-03-31)


* Add clusterAPI capabilities for EKS
Expand Down
33 changes: 17 additions & 16 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
core:
kind:
clusterctl: v1.3.2
cluster-api: v1.3.2
capi-kubeadm-bootstrap-system: v1.3.2
capi-kubeadm-control-plane-system: v1.3.2
clusterctl: v1.4.1
cluster-api: v1.4.1
capi-kubeadm-bootstrap-system: v1.4.1
capi-kubeadm-control-plane-system: v1.4.1
calico:
calicoctl: v3.22.3
calicoctl: v3.25.1
tigera-operator: v1.25.9
cluster-autoscaler: 9.25.0
cluster-autoscaler: 9.28.0
aws:
clusterawsadm: v2.0.2
cluster-api-aws: v2.0.2
cluster-api-aws-templates: v2.0.2
aws-ebs-csi-driver: v1.14.1-eksbuild.1
vpc-cni: v1.12.1-eksbuild.1
aws-ebs-csi-driver: v1.17.0-eksbuild.1
vpc-cni: v1.12.6-eksbuild.1
gcp:
cluster-api-gcp: v1.2.1
cluster-api-gcp-templates: v1.2.1
gcp-compute-persistent-disk-csi-driver: v1.7.1
csi-node-driver-registrar: v2.5.0
csi-snapshotter: v4.0.1
csi-resizer: v1.4.0
csi-attacher: v3.4.0
csi-provisioner: v3.1.0
cluster-api-gcp: v1.3.0
cluster-api-gcp-templates: v1.3.0
gcp-compute-persistent-disk-csi-driver: v1.9.2
csi-node-driver-registrar: v2.6.3
csi-snapshotter: v6.2.1
csi-resizer: v1.7.0
csi-attacher: v4.2.0
csi-provisioner: v3.4.1
pause: v3.9
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ hose {
UPSTREAM_VERSION = '0.17.0'
DEPLOYONPRS = true
GRYPE_TEST = false
MODULE_LIST = [ "paas.cloud-provisioner:cloud-provisioner:tar.gz"]

DEV = { config ->
doPackage(conf: config, parameters: "GOCACHE=/tmp")
doDeploy(conf:config)
doDeploy(conf: config)
}
}
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ test:
# ================================= Cleanup ====================================
# standard cleanup target
clean:
rm -rf "$(OUT_DIR)/"
find $(OUT_DIR)/ -name 'cloud-provisioner*' -delete && rm -rf "$(OUT_DIR)/.gimme"
################################################################################
# ============================== Auto-Update ===================================
# update generated code, gofmt, etc.
Expand All @@ -111,16 +111,14 @@ lint:
shellcheck:
hack/make-rules/verify/shellcheck.sh



package:
go build -v -o "$(OUT_DIR)/$(KIND_BINARY_NAME)" $(KIND_BUILD_FLAGS)
make build && bin/package.sh $(version)

deploy:
hack/custom/deploy.sh
bin/deploy.sh $(version)

change-version:
hack/custom/change-version.sh $(version)
bin/change-version.sh $(version)

#################################################################################
.PHONY: all kind build install unit clean update generate gofmt verify lint shellcheck
2 changes: 1 addition & 1 deletion hack/custom/change-version.sh → bin/change-version.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e

BASEDIR=`dirname $0`/../..
BASEDIR=`dirname $0`/..

cd $BASEDIR

Expand Down
11 changes: 5 additions & 6 deletions hack/custom/deploy.sh → bin/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@

DIR=bin
BASEDIR=`dirname $0`/../..
VERSION=`cat $BASEDIR/VERSION`
VERSION=$1
EXTENSION="tar.gz"
GROUP_ID="repository.paas.cloud-provisioner"
GROUP_ID_NEXUS=${GROUP_ID//.//}
FILE="$DIR"/cloud-provisioner-${VERSION}.${EXTENSION}


if [ -d "$DIR" ] || [ -r "$DIR"/cloud-provisioner]; then
if [ -d "$DIR" ] || [ -r "$FILE" ]; then
echo "Uploading cloud-provisioner-$VERSION..."
tar czf "$DIR"/cloud-provisioner-${VERSION}.${EXTENSION} "$DIR"/cloud-provisioner
curl -sS -u stratio:${NEXUSPASS} --upload-file "$DIR"/cloud-provisioner-${VERSION}.${EXTENSION} http://qa.int.stratio.com/${GROUP_ID_NEXUS}/
echo "$GROUP_ID:cloud-provisioner:$EXTENSION" >> "$BASEDIR/deploy-recorder.lst"
rm -rf $BASEDIR/hack/go
echo "$GROUP_ID:cloud-provisioner:$EXTENSION" >> "$BASEDIR/deploy-recorder.lst"
rm -rf $BASEDIR/hack/go
else
echo "Run 'make build' first"
exit 1
Expand Down
14 changes: 14 additions & 0 deletions bin/package.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash -e

DIR=bin
BASEDIR=`dirname $0`/../..
VERSION=$1
EXTENSION="tar.gz"

if [ -d "$DIR" ] || [ -r "$DIR"/cloud-provisioner]; then
echo "Packaging cloud-provisioner-$VERSION..."
tar czf "$DIR"/cloud-provisioner-${VERSION}.${EXTENSION} "$DIR"/cloud-provisioner
else
echo "Run 'make build' first"
exit 1
fi
153 changes: 153 additions & 0 deletions docs/cloud-provisioner/Versiones.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
# Actualización de versiones

> [kindest/node](https://hub.docker.com/r/kindest/node/tags)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v1.24.7 | 2022-10-26 | v1.27.0 | 2022-04-11 |

Files:
* pkg/apis/config/defaults/image.go
* pkg/cluster/internal/providers/docker/stratio/Dockerfile

> [clusterctl](https://github.com/kubernetes-sigs/cluster-api/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v1.3.2 | 2023-01-10 | v1.4.1 | 2023-04-04 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/providers/docker/stratio/Dockerfile
* pkg/cluster/internal/create/actions/createworker/provider.go

> [clusterawsadm](https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v2.0.2 | 2022-12-01 | v2.0.2 | 2022-12-01 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/providers/docker/stratio/Dockerfile
* pkg/cluster/internal/create/actions/createworker/aws.go

> [Helm](https://github.com/helm/helm/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v3.11.0 | 2022-01-18 | v3.11.3 | 2023-04-12 |

Files:
* pkg/cluster/internal/providers/docker/stratio/Dockerfile

> [cluster_auto_scaler](https://github.com/kubernetes/autoscaler/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v9.25.0 | 2022-02-21 | v9.28.0 | 2023-04-04 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/providers/docker/stratio/Dockerfile

> [Tigera_operator](https://github.com/projectcalico/calico/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v3.22.3 | 2022-05-21 | v3.25.1 | 2023-03-31 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/providers/docker/stratio/Dockerfile
* pkg/cluster/internal/create/actions/createworker/templates/calico-helm-values.tmpl

> [aws-ebs-csi-driver](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v1.14.1-eksbuild.1 | 2022-01-05 | v1.17.0 | 2023-03-14 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/cluster/templates/aws.eks.tmpl

> [vpc-cni](https://github.com/aws/amazon-vpc-cni-k8s/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v1.12.1-eksbuild.1 | 2023-01-05 | v1.12.6-eksbuild.1 | 2023-03-20 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/cluster/templates/aws.eks.tmpl

> [cluster-api-gcp / cluster-api-gcp-templates](https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v1.2.1 | 2022-11-28 | v1.3.0 | 2023-03-17 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/createworker/gcp.go

> [gcp-compute-persistent-disk-csi-driver](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v1.7.1 | 2022-01-09 | v1.9.2 | 2022-03-17 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/createworker/files/gcp-compute-persistent-disk-csi-driver.yaml

> [csi-node-driver-registrar](https://github.com/kubernetes-csi/node-driver-registrar/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v2.5.0 | 2022-02-03 | v2.6.3 | 2023-01-24 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/createworker/files/gcp-compute-persistent-disk-csi-driver.yaml

> [csi-snapshotter](https://github.com/kubernetes-csi/external-snapshotter/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v4.0.1 | 2022-02-10 | v6.2.1 | 2023-01-04 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/createworker/files/gcp-compute-persistent-disk-csi-driver.yaml

> [csi-resizer](https://github.com/kubernetes-csi/external-resizer/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v1.4.0 | 2022-01-21 | v1.7.0 | 2022-12-28 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/createworker/files/gcp-compute-persistent-disk-csi-driver.yaml

> [csi-attacher]()

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v3.4.0 | 2021-12-21 | v4.2.0 | 2023-02-01 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/createworker/files/gcp-compute-persistent-disk-csi-driver.yaml

> [csi-provisioner](https://github.com/kubernetes-csi/external-provisioner/releases)

| Version | Release Date | Latest Version | Latest Release Date |
| ------- | ------------ | -------------- | ------------------- |
| v3.1.0 | 2022-01-12 | v3.4.1 | 2023-04-05 |

Files:
* DEPENDENCIES
* pkg/cluster/internal/create/actions/createworker/files/gcp-compute-persistent-disk-csi-driver.yaml
4 changes: 2 additions & 2 deletions pkg/apis/config/defaults/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
package defaults

// Image is the default for the Config.Image field, aka the default node image.
const Image = "kindest/node:v1.24.7@sha256:5c015142d9b60a0f6c45573f809957076514e38ec973565e2b2fe828b91597f5"
const Image = "kindest/node:v1.27.0@sha256:bac1b0e00322ba0269a5811fb574dab91f93176d9f00cec3b3eb0832beb1ce84"

// StratioImage is the extended Image for Stratio KEOS
const StratioImage = "stratio-capi:v1.24.7"
const StratioImage = "stratio-capi:v1.27.0"
Loading