From a227f94385fa28aa733a9efad692954ac313b3ef Mon Sep 17 00:00:00 2001 From: Adrian Riobo Date: Tue, 8 Oct 2024 10:29:29 +0200 Subject: [PATCH] chore: cut v0.7.0 Signed-off-by: Adrian Riobo --- Makefile | 2 +- tkn/infra-aws-fedora.yaml | 4 +- tkn/infra-aws-mac.yaml | 4 +- tkn/infra-aws-rhel.yaml | 4 +- tkn/infra-aws-windows-server.yaml | 4 +- tkn/infra-azure-aks.yaml | 146 --------------------------- tkn/infra-azure-fedora.yaml | 4 +- tkn/infra-azure-rhel.yaml | 4 +- tkn/infra-azure-windows-desktop.yaml | 4 +- 9 files changed, 15 insertions(+), 161 deletions(-) delete mode 100644 tkn/infra-azure-aks.yaml diff --git a/Makefile b/Makefile index de8d5389..1fc84812 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 0.6.9 +VERSION ?= 0.7.0 CONTAINER_MANAGER ?= podman # Image URL to use all building/pushing image targets IMG ?= quay.io/redhat-developer/mapt:v${VERSION} diff --git a/tkn/infra-aws-fedora.yaml b/tkn/infra-aws-fedora.yaml index b6899eaa..a54717d8 100644 --- a/tkn/infra-aws-fedora.yaml +++ b/tkn/infra-aws-fedora.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-fedora labels: - app.kubernetes.io/version: "0.6.9" + app.kubernetes.io/version: "0.7.0" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -121,7 +121,7 @@ spec: steps: - name: provisioner - image: quay.io/redhat-developer/mapt:v0.7.0-dev + image: quay.io/redhat-developer/mapt:v0.7.0 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-aws-mac.yaml b/tkn/infra-aws-mac.yaml index 82e3081d..e69fd1a5 100644 --- a/tkn/infra-aws-mac.yaml +++ b/tkn/infra-aws-mac.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-mac labels: - app.kubernetes.io/version: "0.6.9" + app.kubernetes.io/version: "0.7.0" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -126,7 +126,7 @@ spec: steps: - name: provisioner - image: quay.io/redhat-developer/mapt:v0.7.0-dev + image: quay.io/redhat-developer/mapt:v0.7.0 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-aws-rhel.yaml b/tkn/infra-aws-rhel.yaml index 4b5c859b..fc211fc5 100644 --- a/tkn/infra-aws-rhel.yaml +++ b/tkn/infra-aws-rhel.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-rhel labels: - app.kubernetes.io/version: "0.6.9" + app.kubernetes.io/version: "0.7.0" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -144,7 +144,7 @@ spec: steps: - name: provisioner - image: quay.io/redhat-developer/mapt:v0.7.0-dev + image: quay.io/redhat-developer/mapt:v0.7.0 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-aws-windows-server.yaml b/tkn/infra-aws-windows-server.yaml index 2a0abc96..f359a071 100644 --- a/tkn/infra-aws-windows-server.yaml +++ b/tkn/infra-aws-windows-server.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-aws-windows-server labels: - app.kubernetes.io/version: "0.6.9" + app.kubernetes.io/version: "0.7.0" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -112,7 +112,7 @@ spec: steps: - name: provisioner - image: quay.io/redhat-developer/mapt:v0.6.9 + image: quay.io/redhat-developer/mapt:v0.7.0 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-azure-aks.yaml b/tkn/infra-azure-aks.yaml deleted file mode 100644 index 2a594d92..00000000 --- a/tkn/infra-azure-aks.yaml +++ /dev/null @@ -1,146 +0,0 @@ ---- -apiVersion: tekton.dev/v1beta1 -kind: Task -metadata: - name: infra-azure-aks - labels: - app.kubernetes.io/version: "0.7.0-dev" - annotations: - tekton.dev/pipelines.minVersion: "0.44.x" - tekton.dev/categories: infrastructure - tekton.dev/tags: infrastructure, azure - tekton.dev/displayName: "azure manager" - tekton.dev/platforms: "linux/amd64" -spec: - description: | - This task will provision / decomission azure aks cluster - - The output will give required information to connect within the remote provisioned cluster - - workspaces: - - name: az-credentials - description: | - ocp secret holding the azure credentials. Secret should be accessible to this task. - - To be a valid secret it should contains the following fields: - * tenant_id - * subscription_id - * client_id - * client_secret - * storage_account (optional if we use remote az storage) - * storage_key (optional if we use remote az storage) - mountPath: /opt/credentials - - params: - # mapt params - - name: project-name - description: identifier for project. - - name: backed-url - description: external az storage (i.e azblob://existing-storage). - - name: operation - description: operation to execute within the infrastructure. Current values (create, destroy) - default: create - - # AKS params - - name: k8s-version - description: AKS K8s cluster version (default "1.30") - default: '1.30' - - name: only-system-pool - description: if we do not need bunch of resources we can run only the systempool. More info https://learn.microsoft.com/es-es/azure/aks/use-system-pools?tabs=azure-cli#system-and-user-node-pools. (default false) - default: 'false' - - name: enable-app-routing - description: enable application routing add-on with NGINX. (default false) - default: 'false' - - # VM type params for pools - - name: spot - description: in case spot is set to true it 'ill check for best spot price and create the VM on the target region - default: 'true' - - name: spot-eviction-tolerance - description: 'if spot is enable we can define the minimum tolerance level of eviction. Allowed value are: lowest, low, medium, high or highest' - default: 'lowest' - - - # Metadata params - - name: tags - description: tags for the resources created on the providers - default: "''" - - # Control params - - name: remove-lock - description: in case a previous run fails the stack can be locked. This value allows to control if remove lock - default: 'true' - - results: - - name: kubeconfig - description: kubeconfig file - - steps: - - name: provisioner - image: quay.io/redhat-developer/mapt:v0.7.0-dev - imagePullPolicy: Always - script: | - #!/bin/sh - - # Added verbosity - set -xuo - - # Credentials - export ARM_TENANT_ID=$(cat /opt/credentials/tenant_id) - export ARM_SUBSCRIPTION_ID=$(cat /opt/credentials/subscription_id) - export ARM_CLIENT_ID=$(cat /opt/credentials/client_id) - export ARM_CLIENT_SECRET=$(cat /opt/credentials/client_secret) - if ! [ -f /opt/credentials/storage_account ]; then - export AZURE_STORAGE_ACCOUNT=$(cat /opt/credentials/storage_account) - fi - if ! [ -f /opt/credentials/storage_key ]; then - export AZURE_STORAGE_KEY=$(cat /opt/credentials/storage_key) - fi - - # Output folder - mkdir -p aks-kubeconfig - - # Remove lock - if [[ $(params.remove-lock) == "true" ]]; then - rm -rf ${workspace_path}/.pulumi/locks/* - fi - - # Run mapt - cmd="mapt azure aks $(params.operation) " - cmd="$cmd --project-name $(params.project-name) " - cmd="$cmd --backed-url $(params.backed-url) " - if [[ $(params.operation) == "create" ]]; then - cmd="$cmd --conn-details-output aks-kubeconfig " - cmd="$cmd --version $(params.k8s-version) " - if [[ $(params.only-system-pool) == "true" ]]; then - cmd="$cmd --only-system-pool " - fi - if [[ $(params.enable-app-routing) == "true" ]]; then - cmd="$cmd --enable-app-routing " - fi - if [[ $(params.spot) == "true" ]]; then - cmd="$cmd --spot " - cmd="$cmd --spot-eviction-tolerance $(params.spot-eviction-tolerance) " - fi - if [[ $(params.tags) != "" ]]; then - cmd="$cmd --tags $(params.tags) " - fi - fi - eval "${cmd}" - - create_exit_code=$? - - # set task results - cat "aks-kubeconfig/kubeconfig" | tee $(results.kubeconfig.path) - - if [[ ${create_exit_code} -ne 0 ]]; then - exit 1 - fi - - resources: - requests: - memory: "200Mi" - cpu: "100m" - limits: - memory: "600Mi" - cpu: "300m" diff --git a/tkn/infra-azure-fedora.yaml b/tkn/infra-azure-fedora.yaml index e20bb158..50cc3f59 100644 --- a/tkn/infra-azure-fedora.yaml +++ b/tkn/infra-azure-fedora.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-azure-rhel labels: - app.kubernetes.io/version: "0.7.0-dev" + app.kubernetes.io/version: "0.7.0" annotations: tekton.dev/pipelines.minVersion: "0.44.x" tekton.dev/categories: infrastructure @@ -97,7 +97,7 @@ spec: steps: - name: provisioner - image: quay.io/redhat-developer/mapt:v0.7.0-dev + image: quay.io/redhat-developer/mapt:v0.7.0 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-azure-rhel.yaml b/tkn/infra-azure-rhel.yaml index 160a8308..011ff9a3 100644 --- a/tkn/infra-azure-rhel.yaml +++ b/tkn/infra-azure-rhel.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-azure-rhel labels: - app.kubernetes.io/version: "0.7.0-dev" + app.kubernetes.io/version: "0.7.0" annotations: tekton.dev/pipelines.minVersion: "0.44.x" tekton.dev/categories: infrastructure @@ -97,7 +97,7 @@ spec: steps: - name: provisioner - image: quay.io/redhat-developer/mapt:v0.7.0-dev + image: quay.io/redhat-developer/mapt:v0.7.0 imagePullPolicy: Always script: | #!/bin/sh diff --git a/tkn/infra-azure-windows-desktop.yaml b/tkn/infra-azure-windows-desktop.yaml index eb848af5..d6b87170 100644 --- a/tkn/infra-azure-windows-desktop.yaml +++ b/tkn/infra-azure-windows-desktop.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: infra-azure-windows-desktop labels: - app.kubernetes.io/version: "0.6.9" + app.kubernetes.io/version: "0.7.0" annotations: tekton.dev/pipelines.minVersion: "0.24.x" tekton.dev/categories: infrastructure @@ -98,7 +98,7 @@ spec: steps: - name: provisioner - image: quay.io/redhat-developer/mapt:v0.7.0-dev + image: quay.io/redhat-developer/mapt:v0.7.0 imagePullPolicy: Always script: | #!/bin/sh