Merge pull request #2358 from Makdaam/release-v22-plconfig

pluginconfig + changelog
openshift · Jun 18, 2021 · e7cad19 · e7cad19
2 parents 4128ddc + b3c1324
commit e7cad19
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,9 @@
+## v22.0
+
+- Enable certificate rotation
+Remove old releases (v15-v19) ([#2353](https://github.com/openshift/openshift-azure/pull/2353), [@mjudeikis](https://github.com/mjudeikis), 16/06/2021)
+
+
+Update VM and container images ([#2347](https://github.com/openshift/openshift-azure/pull/2347), [@mjudeikis](https://github.com/mjudeikis), 22/01/2021)
+
+
diff --git a/pluginconfig/pluginconfig-311.yaml b/pluginconfig/pluginconfig-311.yaml
@@ -105,45 +105,45 @@ versions:
     imageOffer: osa
     imagePublisher: redhat
     imageSku: osa_311
-    imageVersion: 311.346.20210118
+    imageVersion: 311.452.20210618
     images:
-      alertManager: registry.access.redhat.com/openshift3/prometheus-alertmanager:v3.11.346
-      ansibleServiceBroker: registry.access.redhat.com/openshift3/ose-ansible-service-broker:v3.11.346
-      clusterMonitoringOperator: registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator:v3.11.346
-      configReloader: registry.access.redhat.com/openshift3/ose-configmap-reloader:v3.11.346
-      console: registry.access.redhat.com/openshift3/ose-console:v3.11.346
-      controlPlane: registry.access.redhat.com/openshift3/ose-control-plane:v3.11.346
-      grafana: registry.access.redhat.com/openshift3/grafana:v3.11.346
-      kubeRbacProxy: registry.access.redhat.com/openshift3/ose-kube-rbac-proxy:v3.11.346
-      kubeStateMetrics: registry.access.redhat.com/openshift3/ose-kube-state-metrics:v3.11.346
-      node: registry.access.redhat.com/openshift3/ose-node:v3.11.346
-      nodeExporter: registry.access.redhat.com/openshift3/prometheus-node-exporter:v3.11.346
-      oAuthProxy: registry.access.redhat.com/openshift3/oauth-proxy:v3.11.346
-      prometheus: registry.access.redhat.com/openshift3/prometheus:v3.11.346
-      prometheusConfigReloader: registry.access.redhat.com/openshift3/ose-prometheus-config-reloader:v3.11.346
-      prometheusOperator: registry.access.redhat.com/openshift3/ose-prometheus-operator:v3.11.346
-      registry: registry.access.redhat.com/openshift3/ose-docker-registry:v3.11.346
-      registryConsole: registry.access.redhat.com/openshift3/registry-console:v3.11.346
-      router: registry.access.redhat.com/openshift3/ose-haproxy-router:v3.11.346
-      serviceCatalog: registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.346
-      templateServiceBroker: registry.access.redhat.com/openshift3/ose-template-service-broker:v3.11.346
-      webConsole: registry.access.redhat.com/openshift3/ose-web-console:v3.11.346
-      format: registry.access.redhat.com/openshift3/ose-${component}:v3.11.346
+      alertManager: registry.access.redhat.com/openshift3/prometheus-alertmanager:v3.11.452
+      ansibleServiceBroker: registry.access.redhat.com/openshift3/ose-ansible-service-broker:v3.11.452
+      clusterMonitoringOperator: registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator:v3.11.452
+      configReloader: registry.access.redhat.com/openshift3/ose-configmap-reloader:v3.11.452
+      console: registry.access.redhat.com/openshift3/ose-console:v3.11.452
+      controlPlane: registry.access.redhat.com/openshift3/ose-control-plane:v3.11.452
+      grafana: registry.access.redhat.com/openshift3/grafana:v3.11.452
+      kubeRbacProxy: registry.access.redhat.com/openshift3/ose-kube-rbac-proxy:v3.11.452
+      kubeStateMetrics: registry.access.redhat.com/openshift3/ose-kube-state-metrics:v3.11.452
+      node: registry.access.redhat.com/openshift3/ose-node:v3.11.452
+      nodeExporter: registry.access.redhat.com/openshift3/prometheus-node-exporter:v3.11.452
+      oAuthProxy: registry.access.redhat.com/openshift3/oauth-proxy:v3.11.452
+      prometheus: registry.access.redhat.com/openshift3/prometheus:v3.11.452
+      prometheusConfigReloader: registry.access.redhat.com/openshift3/ose-prometheus-config-reloader:v3.11.452
+      prometheusOperator: registry.access.redhat.com/openshift3/ose-prometheus-operator:v3.11.452
+      registry: registry.access.redhat.com/openshift3/ose-docker-registry:v3.11.452
+      registryConsole: registry.access.redhat.com/openshift3/registry-console:v3.11.452
+      router: registry.access.redhat.com/openshift3/ose-haproxy-router:v3.11.452
+      serviceCatalog: registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.452
+      templateServiceBroker: registry.access.redhat.com/openshift3/ose-template-service-broker:v3.11.452
+      webConsole: registry.access.redhat.com/openshift3/ose-web-console:v3.11.452
+      format: registry.access.redhat.com/openshift3/ose-${component}:v3.11.452
       httpd: registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-133.1608869526
       masterEtcd: registry.access.redhat.com/rhel7/etcd:3.2.28-28
       genevaLogging: osarpint.azurecr.io/acs/mdsd:master.20190228.1
       genevaStatsd: osarpint.azurecr.io/acs/mdm:git-a909a2e76
       genevaTDAgent: osarpint.azurecr.io/acs/td-agent:master.20190228.1
       logAnalyticsAgent: mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021
-      metricsServer: registry.access.redhat.com/openshift3/ose-metrics-server:v3.11.346
-      azureControllers: quay.io/openshift-on-azure/ci-azure:latest
-      aroAdmissionController: quay.io/openshift-on-azure/ci-azure:latest
-      canary: quay.io/openshift-on-azure/ci-azure:latest
-      etcdBackup: quay.io/openshift-on-azure/ci-azure:latest
-      metricsBridge: quay.io/openshift-on-azure/ci-azure:latest
-      startup: quay.io/openshift-on-azure/ci-azure:latest
-      sync: quay.io/openshift-on-azure/ci-azure:latest
-      tlsProxy: quay.io/openshift-on-azure/ci-azure:latest
+      metricsServer: registry.access.redhat.com/openshift3/ose-metrics-server:v3.11.452
+      azureControllers: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
+      aroAdmissionController: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
+      canary: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
+      etcdBackup: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
+      metricsBridge: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
+      startup: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
+      sync: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
+      tlsProxy: osarpint.azurecr.io/openshift-on-azure/azure:v22.0
 ## certificates, used to authenticate to external systems
 ## Red Hat CDN client certificates
 #packageRepository: