From f820617fef83ab20de3463ef25e2e1ad012d2e23 Mon Sep 17 00:00:00 2001 From: jkleinschnitz-msft <112512530+jkleinschnitz-msft@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:40:04 -0600 Subject: [PATCH] update to june versions --- arc_data_services/arcdata-installer.yaml | 2 +- arc_data_services/charts/arcdataservices/values.yaml | 2 +- ...and-push-arc-data-services-images-to-private-registry.py | 6 ++---- arc_data_services/deploy/yaml/bootstrapper-unified.yaml | 4 ++-- arc_data_services/deploy/yaml/bootstrapper.yaml | 4 ++-- arc_data_services/deploy/yaml/data-controller.yaml | 2 +- arc_data_services/deploy/yaml/uninstall.yaml | 2 +- arc_data_services/test/launcher/base/kustomization.yaml | 2 +- .../upgrade/yaml/bootstrapper-upgrade-job.yaml | 4 ++-- arc_data_services/upgrade/yaml/data-controller-upgrade.yaml | 3 ++- .../upgrade/yaml/request_body/request-body-after.yaml | 2 +- .../upgrade/yaml/request_body/request-body-before.yaml | 2 +- .../aks/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 | 4 ++-- .../aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../eks/terraform/artifacts/DataServicesLogonScript.ps1 | 2 +- .../gke/terraform/artifacts/DataServicesLogonScript.ps1 | 2 +- .../kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../arm_template/artifacts/DataServicesLogonScript.ps1 | 2 +- azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 | 2 +- .../artifacts/DataServicesLogonScript.ps1 | 2 +- 22 files changed, 28 insertions(+), 29 deletions(-) diff --git a/arc_data_services/arcdata-installer.yaml b/arc_data_services/arcdata-installer.yaml index edc1617e35..d1f6a32e0d 100644 --- a/arc_data_services/arcdata-installer.yaml +++ b/arc_data_services/arcdata-installer.yaml @@ -262,4 +262,4 @@ subjects: roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: arcdata-installer-role \ No newline at end of file + name: arcdata-installer-role diff --git a/arc_data_services/charts/arcdataservices/values.yaml b/arc_data_services/charts/arcdataservices/values.yaml index a6fc4b4a4f..251f074843 100644 --- a/arc_data_services/charts/arcdataservices/values.yaml +++ b/arc_data_services/charts/arcdataservices/values.yaml @@ -38,7 +38,7 @@ Azure: InstallerServiceAccount: "" RuntimeServiceAccount: "" systemDefaultValues: - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11 imagePullPolicy: Always imagePullSecret: arc-private-registry installerServiceAccount: "" diff --git a/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py b/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py index 389737bdd8..9308f89230 100644 --- a/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py +++ b/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py @@ -54,9 +54,9 @@ def execute_cmd(cmd): if os.getenv("SOURCE_DOCKER_TAG") is None: SOURCE_DOCKER_TAG = ( input( - "Provide container image tag for the images at the source - press ENTER for using 'v1.29.0_2024-04-09': " + "Provide container image tag for the images at the source - press ENTER for using 'v1.30.0_2024-06-11': " ) - or "v1.29.0_2024-04-09" + or "v1.30.0_2024-06-11" ) else: SOURCE_DOCKER_TAG = os.environ["SOURCE_DOCKER_TAG"] @@ -102,14 +102,12 @@ def execute_cmd(cmd): "arc-dns", "arc-ha-orchestrator", "arc-ha-supervisor", - "arc-kafka", "arc-monitor-collectd", "arc-monitor-opensearch", "arc-monitor-opensearch-dashboards", "arc-monitor-fluentbit", "arc-monitor-grafana", "arc-monitor-influxdb", - "arc-monitor-opentelemetry-collector", "arc-monitor-telegraf", "arc-postgres-14", "arc-postgresql-agent", diff --git a/arc_data_services/deploy/yaml/bootstrapper-unified.yaml b/arc_data_services/deploy/yaml/bootstrapper-unified.yaml index 8ab5fc844c..8325bfbe20 100644 --- a/arc_data_services/deploy/yaml/bootstrapper-unified.yaml +++ b/arc_data_services/deploy/yaml/bootstrapper-unified.yaml @@ -331,11 +331,11 @@ spec: kubernetes.io/os: linux containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11 imagePullPolicy: Always args: - -image - - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09 + - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11 - -policy - Always - -chart diff --git a/arc_data_services/deploy/yaml/bootstrapper.yaml b/arc_data_services/deploy/yaml/bootstrapper.yaml index aeeac5983a..65286f3b35 100644 --- a/arc_data_services/deploy/yaml/bootstrapper.yaml +++ b/arc_data_services/deploy/yaml/bootstrapper.yaml @@ -9,11 +9,11 @@ spec: kubernetes.io/os: linux containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11 imagePullPolicy: Always args: - -image - - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09 + - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11 - -policy - Always - -chart diff --git a/arc_data_services/deploy/yaml/data-controller.yaml b/arc_data_services/deploy/yaml/data-controller.yaml index f33bea86e2..8d2d48a6ef 100644 --- a/arc_data_services/deploy/yaml/data-controller.yaml +++ b/arc_data_services/deploy/yaml/data-controller.yaml @@ -30,7 +30,7 @@ spec: serviceAccount: sa-arc-controller docker: imagePullPolicy: Always - imageTag: v1.29.0_2024-04-09 + imageTag: v1.30.0_2024-06-11 registry: mcr.microsoft.com repository: arcdata infrastructure: other # Must be a value in the array [alibaba, aws, azure, gcp, onpremises, other] diff --git a/arc_data_services/deploy/yaml/uninstall.yaml b/arc_data_services/deploy/yaml/uninstall.yaml index 0c002d6310..3a8972d119 100644 --- a/arc_data_services/deploy/yaml/uninstall.yaml +++ b/arc_data_services/deploy/yaml/uninstall.yaml @@ -9,7 +9,7 @@ spec: kubernetes.io/os: linux containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11 imagePullPolicy: IfNotPresent args: ["-uninstall"] command: ["/opt/bootstrapper/bin/bootstrapper"] diff --git a/arc_data_services/test/launcher/base/kustomization.yaml b/arc_data_services/test/launcher/base/kustomization.yaml index 376eb79cb2..ee64087e54 100644 --- a/arc_data_services/test/launcher/base/kustomization.yaml +++ b/arc_data_services/test/launcher/base/kustomization.yaml @@ -10,4 +10,4 @@ secretGenerator: images: - name: arc-ci-launcher newName: mcr.microsoft.com/arcdata/arc-ci-launcher - newTag: v1.29.0_2024-04-09 + newTag: v1.30.0_2024-04-09 diff --git a/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml b/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml index bfdc579438..a2d2ff6177 100644 --- a/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml +++ b/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml @@ -11,10 +11,10 @@ spec: - name: your-private-registry containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11 imagePullPolicy: Always command: ["/opt/bootstrapper/bin/bootstrapper"] - args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.29.0_2024-04-09", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"] + args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.30.0_2024-06-11", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"] resources: limits: cpu: 200m diff --git a/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml b/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml index 5a397921ab..be7ae8a40d 100644 --- a/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml +++ b/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml @@ -4,4 +4,5 @@ metadata: name: arc spec: docker: - imageTag: v1.29.0_2024-04-09 + imageTag: v1.30.0_2024-06-11 + \ No newline at end of file diff --git a/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml b/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml index 9e2f91488b..cfc95fc4db 100644 --- a/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml +++ b/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml @@ -27,7 +27,7 @@ }, "docker": { "imagePullPolicy": "Always", - "imageTag": "v1.29.0_2024-04-09", + "imageTag": "v1.30.0_2024-06-11", "registry": "", "repository": "" }, diff --git a/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml b/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml index 8eb571c576..15b7eee24f 100644 --- a/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml +++ b/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml @@ -25,7 +25,7 @@ }, "docker": { "imagePullPolicy": "Always", - "imageTag": "v1.29.0_2024-04-09", + "imageTag": "v1.30.0_2024-06-11", "registry": "", "repository": "" }, diff --git a/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 index edd5dcf7ac..b5bdee0336 100644 --- a/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 @@ -116,7 +116,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper diff --git a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 index 46796fedec..0ea034aef5 100644 --- a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 @@ -135,7 +135,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` @@ -229,7 +229,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 index 5123ea1aaf..525af874d2 100644 --- a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 @@ -224,7 +224,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 index b616d1e85b..f2dd3eff8d 100644 --- a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 @@ -110,7 +110,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 index 57f7949d49..ced23bb000 100644 --- a/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 @@ -134,7 +134,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper diff --git a/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 index da00574d29..f168b62252 100644 --- a/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 @@ -123,7 +123,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 index 2f65be8c47..e31e93c5eb 100644 --- a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 @@ -146,7 +146,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper diff --git a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 index 8a483b03d2..6a21e7490c 100644 --- a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 @@ -112,7 +112,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 index 6a1b74eaf3..7a18318235 100644 --- a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 +++ b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 @@ -218,7 +218,7 @@ foreach ($cluster in $clusters) { --auto-upgrade false ` --scope cluster ` --release-namespace arc ` - --version 1.29.0 ` + --version 1.30.0 ` --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper Write-Host "`n" diff --git a/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 index 2c84fda11e..37b5e89126 100644 --- a/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 +++ b/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 @@ -100,7 +100,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.29.0 ` + --version 1.30.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper