From 0f9eda3e98e38317ef3a256d467824a070406382 Mon Sep 17 00:00:00 2001 From: Konstantinos Samaras-Tsakiris <ksamtsak@gmail.com> Date: Wed, 26 Jan 2022 18:23:42 +0100 Subject: [PATCH] Change default drupalversion to v9.3-1 --- chart/drupalsite-operator/values.yaml | 4 ++-- controllers/drupalsite_controller.go | 2 +- main.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chart/drupalsite-operator/values.yaml b/chart/drupalsite-operator/values.yaml index 361a6f0a..2c595da7 100644 --- a/chart/drupalsite-operator/values.yaml +++ b/chart/drupalsite-operator/values.yaml @@ -24,9 +24,9 @@ drupalsiteOperator: # Zap Level at and above which stacktraces are captured (one of 'info', 'error') logStacktraceLevel: "error" # defaultReleaseSpec refers to the default D8 releaseSpec. In the operator code, it is tagged as 'defaultD8ReleaseSpec' - defaultReleaseSpec: "RELEASE-2022.01.17T12-36-36Z" + defaultReleaseSpec: "RELEASE-2022.01.25T10-50-33Z" # defaultReleaseSpec refers to the default D9 releaseSpec - defaultD9ReleaseSpec: "RELEASE-2022.01.17T12-36-51Z" + defaultD9ReleaseSpec: "RELEASE-2022.01.25T10-50-27Z" parallelThreadCount: 1 # Topology spread adds an anti-affinity rule to the server deployment, spreading critical sites across availability zones enableTopologySpread: false diff --git a/controllers/drupalsite_controller.go b/controllers/drupalsite_controller.go index 36af37a1..3c70e792 100644 --- a/controllers/drupalsite_controller.go +++ b/controllers/drupalsite_controller.go @@ -71,7 +71,7 @@ var ( VeleroNamespace string // DefaultD8ReleaseSpec refers to the releaseSpec for Drupal 8 to be defaulted incase it is empty DefaultD8ReleaseSpec string - // DefaultD9ReleaseSpec refers to the releaseSpec for Drupal 8 to be defaulted incase it is empty + // DefaultD9ReleaseSpec refers to the releaseSpec for Drupal 9 to be defaulted incase it is empty DefaultD9ReleaseSpec string // ParallelThreadCount refers to the number of parallel reconciliations done by the Operator ParallelThreadCount int diff --git a/main.go b/main.go index bddb598f..247f2e33 100644 --- a/main.go +++ b/main.go @@ -81,8 +81,8 @@ func main() { flag.StringVar(&controllers.WebDAVImage, "webdav-image", "gitlab-registry.cern.ch/drupal/paas/sabredav/webdav:RELEASE-2021.10.12T17-55-06Z", "The webdav source image name.") flag.StringVar(&controllers.SMTPHost, "smtp-host", "cernmx.cern.ch", "SMTP host used by Drupal server pods to send emails.") flag.StringVar(&controllers.VeleroNamespace, "velero-namespace", "openshift-cern-drupal", "The namespace of the Velero server to create backups") - flag.StringVar(&controllers.DefaultD8ReleaseSpec, "default-d8-release-spec", "RELEASE-2022.01.17T12-36-36Z", "The default releaseSpec value to be passed to the DrupalSites") - flag.StringVar(&controllers.DefaultD9ReleaseSpec, "default-d9-release-spec", "RELEASE-2022.01.17T12-36-51Z", "The default releaseSpec value to be passed to the DrupalSites") + flag.StringVar(&controllers.DefaultD8ReleaseSpec, "default-d8-release-spec", "RELEASE-2022.01.25T10-50-33Z", "The default releaseSpec value to be passed to the DrupalSites") + flag.StringVar(&controllers.DefaultD9ReleaseSpec, "default-d9-release-spec", "RELEASE-2022.01.25T10-50-27Z", "The default releaseSpec value to be passed to the DrupalSites") flag.IntVar(&controllers.ParallelThreadCount, "parallel-thread-count", 1, "The default number of parallel threads executed by the DrupalSite Operator controllers") flag.BoolVar(&controllers.EnableTopologySpread, "enable-topology-spread", false, "Enable avaliability zone scheduling for critical site deployments") flag.StringVar(&controllers.ClusterName, "cluster-name", "", "Name of the cluster the operator is deployed on") -- GitLab