Use tags for everything (#199)

azimuth-cloud · Oct 31, 2023 · 05fdfcd · 05fdfcd
1 parent b05fc39
commit 05fdfcd
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 36 deletions.
diff --git a/.github/scripts/requirements.txt b/.github/scripts/requirements.txt
@@ -1,4 +1,4 @@
-easysemver @ git+https://github.com/stackhpc/easysemver
+easysemver
 pyjwt
 requests
 ruamel.yaml
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -19,55 +19,64 @@ jobs:
             repo_variable: azimuth_chart_repo
             chart_variable: azimuth_chart_name
             version_variable: azimuth_chart_version
-            # For now, use builds for main
-            # TODO(mkjpryor) Remove this constraint to use stable versions only
-            constraints: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
 
           - component: azimuth-caas-operator
             type: helm
             path: ./roles/azimuth_caas_operator/defaults/main.yml
             repo_variable: azimuth_caas_operator_chart_repo
             chart_variable: azimuth_caas_operator_chart_name
             version_variable: azimuth_caas_operator_chart_version
-            # For now, use builds for main
-            # TODO(mkjpryor) Remove this constraint to use stable versions only
-            constraints: ">=0.2.3-dev.0.main.0,<0.2.3-dev.0.main.999999999"
 
           - component: azimuth-capi-operator
             type: helm
             path: ./roles/azimuth_capi_operator/defaults/main.yml
             repo_variable: azimuth_capi_operator_chart_repo
             chart_variable: azimuth_capi_operator_chart_name
             version_variable: azimuth_capi_operator_chart_version
-            # For now, use builds for main
-            # TODO(mkjpryor) Remove this constraint to use stable versions only
-            constraints: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
 
           - component: azimuth-identity-operator
             type: helm
             path: ./roles/azimuth_identity_operator/defaults/main.yml
             repo_variable: azimuth_identity_operator_chart_repo
             chart_variable: azimuth_identity_operator_chart_name
             version_variable: azimuth_identity_operator_chart_version
-            # For now, use builds for main
-            # TODO(mkjpryor) Remove this constraint to use stable versions only
-            constraints: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
 
           - component: azimuth-images
             type: github
             path: ./roles/community_images/defaults/main.yml
             repo_variable: community_images_azimuth_images_repo
             version_variable: community_images_azimuth_images_version
 
+          - component: caas-slurm-appliance
+            type: github
+            path: ./roles/azimuth_caas_operator/defaults/main.yml
+            repo_variable: azimuth_caas_stackhpc_slurm_appliance_git_url
+            version_variable: azimuth_caas_stackhpc_slurm_appliance_git_version
+
+          - component: caas-workstation
+            type: github
+            path: ./roles/azimuth_caas_operator/defaults/main.yml
+            repo_variable: azimuth_caas_stackhpc_workstation_git_url
+            version_variable: azimuth_caas_stackhpc_workstation_git_version
+
+          - component: caas-repo2docker
+            type: github
+            path: ./roles/azimuth_caas_operator/defaults/main.yml
+            repo_variable: azimuth_caas_stackhpc_repo2docker_git_url
+            version_variable: azimuth_caas_stackhpc_repo2docker_git_version
+
+          - component: caas-rstudio
+            type: github
+            path: ./roles/azimuth_caas_operator/defaults/main.yml
+            repo_variable: azimuth_caas_stackhpc_rstudio_git_url
+            version_variable: azimuth_caas_stackhpc_rstudio_git_version
+
           - component: capi-helm-openstack-cluster
             type: helm
             path: ./roles/capi_cluster/defaults/main.yml
             repo_variable: capi_cluster_chart_repo
             chart_variable: capi_cluster_chart_name
             version_variable: capi_cluster_chart_version
-            # For now, use builds for main
-            # TODO(mkjpryor) Remove this constraint to use stable versions only
-            constraints: ">=0.1.2-dev.0.main.0,<0.1.2-dev.0.main.999999999"
 
           - component: cert-manager
             type: helm
@@ -108,9 +117,6 @@ jobs:
             repo_variable: clusterapi_janitor_openstack_chart_repo
             chart_variable: clusterapi_janitor_openstack_chart_name
             version_variable: clusterapi_janitor_openstack_chart_version
-            # For now, use builds for main
-            # TODO(mkjpryor) Remove this constraint to use stable versions only
-            constraints: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
 
           - component: consul
             type: helm
@@ -164,9 +170,6 @@ jobs:
             repo_variable: zenith_chart_repo
             chart_variable: zenith_chart_name
             version_variable: zenith_chart_version
-            # For now, use builds for main
-            # TODO(mkjpryor) Remove this constraint to use stable versions only
-            constraints: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
 
     name: ${{ matrix.component }}
     steps:

diff --git a/galaxy.yml b/galaxy.yml
@@ -13,4 +13,4 @@ dependencies:
   ansible.posix: "1.5.4"
   community.general: "7.4.0"
   kubernetes.core: "2.4.0"
-  "git+https://github.com/stackhpc/ansible-collection-terraform.git": "71c998a0fd274519d37df5202af5b9f53eca1482"
+  "git+https://github.com/stackhpc/ansible-collection-terraform.git": "0.1.0"
diff --git a/roles/azimuth/defaults/main.yml b/roles/azimuth/defaults/main.yml
@@ -3,7 +3,7 @@
 # The chart to use
 azimuth_chart_repo: https://stackhpc.github.io/azimuth
 azimuth_chart_name: azimuth
-azimuth_chart_version: 0.1.0-dev.0.master.762
+azimuth_chart_version: 0.1.0
 
 # Release information for the Azimuth release
 azimuth_release_namespace: azimuth

diff --git a/roles/azimuth_caas_operator/defaults/main.yml b/roles/azimuth_caas_operator/defaults/main.yml
@@ -2,7 +2,7 @@
 # The chart to use
 azimuth_caas_operator_chart_repo: https://stackhpc.github.io/azimuth-caas-operator
 azimuth_caas_operator_chart_name: azimuth-caas-operator
-azimuth_caas_operator_chart_version: 0.4.0
+azimuth_caas_operator_chart_version: 0.4.1
 
 # Release information for the operator release
 # Use the same namespace as Azimuth by default
@@ -79,7 +79,7 @@ azimuth_caas_stackhpc_slurm_appliance_enabled: "{{ azimuth_clusters_enabled }}"
 # The git URL for the StackHPC Slurm appliance
 azimuth_caas_stackhpc_slurm_appliance_git_url: https://github.com/stackhpc/caas-slurm-appliance.git
 # The git version for the StackHPC Slurm appliance
-azimuth_caas_stackhpc_slurm_appliance_git_version: 59d1b299f47404ca50283b31bf2508830052c3bf # merged https://github.com/stackhpc/caas-slurm-appliance/pull/42
+azimuth_caas_stackhpc_slurm_appliance_git_version: 0.1.0
 # The playbook to use for the StackHPC Slurm appliance
 azimuth_caas_stackhpc_slurm_appliance_playbook: slurm-infra.yml
 # The metadata root for the StackHPC Slurm appliance
@@ -149,7 +149,7 @@ azimuth_caas_stackhpc_workstation_enabled: "{{ azimuth_clusters_enabled }}"
 # The git URL for the StackHPC workstation
 azimuth_caas_stackhpc_workstation_git_url: https://github.com/stackhpc/caas-workstation.git
 # The git version for the StackHPC workstation
-azimuth_caas_stackhpc_workstation_git_version: 8c86cfebb02ecd8a9ec2d4dccf806aa5989670f2
+azimuth_caas_stackhpc_workstation_git_version: 0.1.0
 # The playbook to use for the workstation appliance
 azimuth_caas_stackhpc_workstation_playbook: workstation.yml
 # The metadata URL for the StackHPC workstation
@@ -215,7 +215,7 @@ azimuth_caas_stackhpc_repo2docker_enabled: "{{ azimuth_clusters_enabled }}"
 # The git URL for the StackHPC repo2docker appliance
 azimuth_caas_stackhpc_repo2docker_git_url: https://github.com/stackhpc/caas-repo2docker.git
 # The git version for the StackHPC repo2docker appliance
-azimuth_caas_stackhpc_repo2docker_git_version: 8385160f69646e615a51173e107e20e2485e2457
+azimuth_caas_stackhpc_repo2docker_git_version: 0.1.0
 # The playbook to use for the StackHPC repo2docker appliance
 azimuth_caas_stackhpc_repo2docker_playbook: repo2docker.yml
 # The metadata root for the StackHPC repo2docker appliance project
@@ -260,7 +260,7 @@ azimuth_caas_stackhpc_rstudio_enabled: "{{ azimuth_clusters_enabled }}"
 # The git URL for the StackHPC R-Studio appliance
 azimuth_caas_stackhpc_rstudio_git_url: https://github.com/stackhpc/caas-r-studio-server
 # The git version for the StackHPC R-Studio appliance
-azimuth_caas_stackhpc_rstudio_git_version: d7f6362708dd275a54f839fd2c2833b0dc5a33ad
+azimuth_caas_stackhpc_rstudio_git_version: 0.1.0
 # The playbook to use for the StackHPC R-Studio appliance
 azimuth_caas_stackhpc_rstudio_playbook: rstudio.yml
 # The metadata root for the StackHPC R-Studio appliance project

diff --git a/roles/azimuth_capi_operator/defaults/main.yml b/roles/azimuth_capi_operator/defaults/main.yml
@@ -3,7 +3,7 @@
 # The chart to use
 azimuth_capi_operator_chart_repo: https://stackhpc.github.io/azimuth-capi-operator
 azimuth_capi_operator_chart_name: azimuth-capi-operator
-azimuth_capi_operator_chart_version: 0.1.0-dev.0.main.138
+azimuth_capi_operator_chart_version: 0.1.0
 
 # Release information for the CAPI operator release
 # Use the same namespace as Azimuth by default
@@ -469,7 +469,7 @@ azimuth_capi_operator_app_templates_jupyterhub_chart_name: jupyterhub-azimuth
 # The Helm repository to use for the JupyterHub app template
 azimuth_capi_operator_app_templates_jupyterhub_chart_repo: https://stackhpc.github.io/azimuth-charts
 # The version range to use for the JupyterHub Helm chart
-azimuth_capi_operator_app_templates_jupyterhub_version_range: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
+azimuth_capi_operator_app_templates_jupyterhub_version_range: ">=0.0.0"
 # Overrides for the label, logo and description from the JupyterHub Helm chart
 azimuth_capi_operator_app_templates_jupyterhub_label:
 azimuth_capi_operator_app_templates_jupyterhub_logo:
@@ -517,7 +517,7 @@ azimuth_capi_operator_app_templates_daskhub_chart_name: daskhub-azimuth
 # The Helm repository to use for the DaskHub app template
 azimuth_capi_operator_app_templates_daskhub_chart_repo: https://stackhpc.github.io/azimuth-charts
 # The version range to use for the DaskHub Helm chart
-azimuth_capi_operator_app_templates_daskhub_version_range: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
+azimuth_capi_operator_app_templates_daskhub_version_range: ">=0.0.0"
 # Overrides for the label, logo and description from the DaskHub Helm chart
 azimuth_capi_operator_app_templates_daskhub_label:
 azimuth_capi_operator_app_templates_daskhub_logo:
@@ -565,7 +565,7 @@ azimuth_capi_operator_app_templates_kubeflow_chart_name: kubeflow-azimuth
 # The Helm repository to use for the kubeflow app template
 azimuth_capi_operator_app_templates_kubeflow_chart_repo: https://stackhpc.github.io/azimuth-charts
 # The version range to use for the kubeflow Helm chart
-azimuth_capi_operator_app_templates_kubeflow_version_range: ">=0.1.0-dev.0.main.0,<0.1.0-dev.0.main.999999999"
+azimuth_capi_operator_app_templates_kubeflow_version_range: ">=0.0.0"
 # Overrides for the label, logo and description from the kubeflow Helm chart
 azimuth_capi_operator_app_templates_kubeflow_label:
 azimuth_capi_operator_app_templates_kubeflow_logo:

diff --git a/roles/azimuth_identity_operator/defaults/main.yml b/roles/azimuth_identity_operator/defaults/main.yml
@@ -3,7 +3,7 @@
 # The chart to use
 azimuth_identity_operator_chart_repo: https://stackhpc.github.io/azimuth-identity-operator
 azimuth_identity_operator_chart_name: azimuth-identity-operator
-azimuth_identity_operator_chart_version: 0.1.0-dev.0.main.17
+azimuth_identity_operator_chart_version: 0.1.0
 
 # Release information for the operator release
 # Use the same namespace as Azimuth by default

diff --git a/roles/clusterapi/defaults/main.yml b/roles/clusterapi/defaults/main.yml
@@ -95,7 +95,7 @@ clusterapi_addon_provider_release_values: {}
 # Helm chart information for the Cluster API janitor
 clusterapi_janitor_openstack_chart_repo: https://stackhpc.github.io/cluster-api-janitor-openstack
 clusterapi_janitor_openstack_chart_name: cluster-api-janitor-openstack
-clusterapi_janitor_openstack_chart_version: 0.1.0
+clusterapi_janitor_openstack_chart_version: 0.2.0
 
 # Release information for the Cluster API janitor release
 clusterapi_janitor_openstack_release_namespace: capi-janitor-system

diff --git a/roles/zenith/defaults/main.yml b/roles/zenith/defaults/main.yml
@@ -3,7 +3,7 @@
 # The chart to use
 zenith_chart_repo: https://stackhpc.github.io/zenith
 zenith_chart_name: zenith-server
-zenith_chart_version: 0.1.0-dev.0.main.232
+zenith_chart_version: 0.1.0
 
 # Release information for the Zenith release
 # Use the same namespace as the Azimuth release by default