From 60c1fa995066656d0e8554aa5e8b98b1f6bc3c26 Mon Sep 17 00:00:00 2001 From: Anurag <81210977+kranurag7@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:27:12 +0530 Subject: [PATCH] create v2 release of cluster stacks this commit updates everything for v2 release. Signed-off-by: Anurag <81210977+kranurag7@users.noreply.github.com> --- Makefile | 3 +++ providers/docker/ferrol/1-27/cluster-addon-values.yaml | 5 +++++ providers/docker/ferrol/1-27/cluster-addon/Chart.yaml | 2 +- providers/docker/ferrol/1-27/cluster-class/Chart.yaml | 2 +- providers/docker/ferrol/1-27/metadata.yaml | 6 +++--- providers/docker/ferrol/1-27/topology-docker.yaml | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 providers/docker/ferrol/1-27/cluster-addon-values.yaml diff --git a/Makefile b/Makefile index 99c6a595..e5d63845 100644 --- a/Makefile +++ b/Makefile @@ -295,6 +295,9 @@ release-docker: clean-release $(HELM) ## Builds and push container images using # git checkout "${RELEASE_TAG}" @./hack/ensure-env-variables.sh RELEASE_CLUSTER_CLASS RELEASE_KUBERNETES_VERSION @mkdir -p .release + cp providers/docker/$(RELEASE_CLUSTER_CLASS)/$(RELEASE_KUBERNETES_VERSION)/cluster-addon-values.yaml .release/ + cp providers/docker/$(RELEASE_CLUSTER_CLASS)/$(RELEASE_KUBERNETES_VERSION)/node-images.yaml .release/ + cp providers/docker/$(RELEASE_CLUSTER_CLASS)/$(RELEASE_KUBERNETES_VERSION)/metadata.yaml .release/ cp providers/docker/$(RELEASE_CLUSTER_CLASS)/$(RELEASE_KUBERNETES_VERSION)/topology-* .release/ $(HELM) package providers/docker/$(RELEASE_CLUSTER_CLASS)/$(RELEASE_KUBERNETES_VERSION)/cluster-addon -d .release/ $(HELM) package providers/docker/$(RELEASE_CLUSTER_CLASS)/$(RELEASE_KUBERNETES_VERSION)/cluster-class -d .release/ diff --git a/providers/docker/ferrol/1-27/cluster-addon-values.yaml b/providers/docker/ferrol/1-27/cluster-addon-values.yaml new file mode 100644 index 00000000..e0033983 --- /dev/null +++ b/providers/docker/ferrol/1-27/cluster-addon-values.yaml @@ -0,0 +1,5 @@ +values: | + metrics-server: + commonLabels: + domain: "{{ .Cluster.spec.controlPlaneEndpoint.host }}" + clusterAddonVersion: "v2" diff --git a/providers/docker/ferrol/1-27/cluster-addon/Chart.yaml b/providers/docker/ferrol/1-27/cluster-addon/Chart.yaml index c6d7f08b..53292338 100644 --- a/providers/docker/ferrol/1-27/cluster-addon/Chart.yaml +++ b/providers/docker/ferrol/1-27/cluster-addon/Chart.yaml @@ -4,7 +4,7 @@ description: | This chart installs and configures: * Docker Ferrol Cluster Class name: docker-ferrol-1-27-cluster-addon -version: "v1" +version: "v2" maintainers: - name: Syself email: info@syself.com diff --git a/providers/docker/ferrol/1-27/cluster-class/Chart.yaml b/providers/docker/ferrol/1-27/cluster-class/Chart.yaml index 292807be..c67e1f31 100644 --- a/providers/docker/ferrol/1-27/cluster-class/Chart.yaml +++ b/providers/docker/ferrol/1-27/cluster-class/Chart.yaml @@ -8,4 +8,4 @@ maintainers: url: https://github.com/syself name: docker-ferrol-1-27-cluster-class type: application -version: "v1" +version: "v2" diff --git a/providers/docker/ferrol/1-27/metadata.yaml b/providers/docker/ferrol/1-27/metadata.yaml index 99af1587..e59ea27a 100644 --- a/providers/docker/ferrol/1-27/metadata.yaml +++ b/providers/docker/ferrol/1-27/metadata.yaml @@ -1,7 +1,7 @@ apiVersion: metadata.clusterstack.x-k8s.io/v1alpha1 versions: - clusterStack: v1 + clusterStack: v2 kubernetes: v1.27.3 components: - clusterAddon: v1 - nodeImage: v1 \ No newline at end of file + clusterAddon: v2 + nodeImage: v2 diff --git a/providers/docker/ferrol/1-27/topology-docker.yaml b/providers/docker/ferrol/1-27/topology-docker.yaml index 6f8790ff..14883841 100644 --- a/providers/docker/ferrol/1-27/topology-docker.yaml +++ b/providers/docker/ferrol/1-27/topology-docker.yaml @@ -11,7 +11,7 @@ spec: cidrBlocks: ["192.168.0.0/16"] serviceDomain: "cluster.local" topology: - class: docker-ferrol-1-27-v1 + class: docker-ferrol-1-27-v2 controlPlane: metadata: {} replicas: 1