From bd3bc06110c4ec580f082a57498a84aa931cfbf6 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Thu, 31 Mar 2022 22:26:30 -0700 Subject: [PATCH] [release-2.2] bump kommander charts to rc.4 (#288) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: bumping kubetunnel to 0.0.11 (#262) * fix: Increase kustomization interval to 6h (#256) * fix: Add retryInterval to all kustomizations * build: Add dir prefix in release tarball * build: Only include relevant files in release tarball * feat: Add dkp-insights-management v0.1.2 (#263) * feat: Add dkp-insights-managment v0.1.0-rc.2 * fix: use v0.1.2 instead of previous rc releases * fix: add charts/ to base helm mirror path * fix: undo charts/ to base helm mirror path * fix: rename folders to 0.1.2 to align version numbers * fix: Rework DKP Insights to have kustomization point to helmrelease * fix: add retryInterval * feat: bump kubecost to 0.23.2 (#267) * chore(logging-operator): bump configmap-reload image to v0.7.1 (#269) * build: Use /dkp/ as s3 path for release (#272) * feat: bump kubecost to 0.23.3 (#270) * feat: bump logging-operator to 3.17.2 (#277) * chore(loki): Bump gateway nginx image tag * chore: Update comment on image override * feat: bump dex chart to 2.9.14 (#280) * fix: Add metadata name to mtls-proxy (#281) * feat: bump KPS to 33.1.5 (#282) * feat: Bump gitea to 5.0.4 (#279) Signed-off-by: Mikołaj Baranowski * fix: Use - instead of _ in arch name (#286) * feat: add flux to default apps (#271) * fix: Bump fluentbit and logging-operator to use same fluentbit image (#285) * fix: Bump fluentbit to solve CVEs Signed-off-by: Mikołaj Baranowski * chore: Bump logging-operator to 3.17.2 * chore: Add comment to upgrade fluent-bit img Co-authored-by: Grace Do * feat: Bump kommander to rc.4 Co-authored-by: Weiyanli Chen(York) <6115189+cwyl02@users.noreply.github.com> Co-authored-by: Casey Buto Co-authored-by: Jimmi Dyson Co-authored-by: Kaiwalya R Joshi Co-authored-by: Mikołaj Baranowski Co-authored-by: Tarun Gupta Akirala --- make/release.mk | 2 +- services/fluent-bit/{0.19.17 => 0.19.22}/defaults/cm.yaml | 4 ++-- .../{0.19.17 => 0.19.22}/defaults/kustomization.yaml | 0 services/fluent-bit/{0.19.17 => 0.19.22}/fluent-bit.yaml | 4 ++-- .../fluent-bit/{0.19.17 => 0.19.22}/kustomization.yaml | 0 .../0.2.0/kommander-appmanagement.yaml | 2 +- services/kommander/0.2.0/defaults/cm.yaml | 1 + services/kommander/0.2.0/kommander.yaml | 2 +- .../logging-operator/{3.17.2 => 3.17.3}/defaults/cm.yaml | 7 ++++--- .../{3.17.2 => 3.17.3}/defaults/kustomization.yaml | 0 .../logging-operator/{3.17.2 => 3.17.3}/kustomization.yaml | 0 .../{3.17.2 => 3.17.3}/logging-operator-logging.yaml | 6 +++--- .../{3.17.2 => 3.17.3}/logging-operator.yaml | 4 ++-- 13 files changed, 17 insertions(+), 15 deletions(-) rename services/fluent-bit/{0.19.17 => 0.19.22}/defaults/cm.yaml (98%) rename services/fluent-bit/{0.19.17 => 0.19.22}/defaults/kustomization.yaml (100%) rename services/fluent-bit/{0.19.17 => 0.19.22}/fluent-bit.yaml (90%) rename services/fluent-bit/{0.19.17 => 0.19.22}/kustomization.yaml (100%) rename services/logging-operator/{3.17.2 => 3.17.3}/defaults/cm.yaml (95%) rename services/logging-operator/{3.17.2 => 3.17.3}/defaults/kustomization.yaml (100%) rename services/logging-operator/{3.17.2 => 3.17.3}/kustomization.yaml (100%) rename services/logging-operator/{3.17.2 => 3.17.3}/logging-operator-logging.yaml (84%) rename services/logging-operator/{3.17.2 => 3.17.3}/logging-operator.yaml (89%) diff --git a/make/release.mk b/make/release.mk index 24e8b8c24..1515bed5c 100644 --- a/make/release.mk +++ b/make/release.mk @@ -3,7 +3,7 @@ S3_PATH ?= "dkp/$(GIT_TAG)" S3_ACL ?= "bucket-owner-full-control" .PHONY: release -release: ARCHIVE_NAME = kommander-applications_$(GIT_TAG).tar.gz +release: ARCHIVE_NAME = kommander-applications-$(GIT_TAG).tar.gz release: install-tool.awscli git archive --format "tar.gz" -o $(ARCHIVE_NAME) \ --prefix kommander-applications/ \ diff --git a/services/fluent-bit/0.19.17/defaults/cm.yaml b/services/fluent-bit/0.19.22/defaults/cm.yaml similarity index 98% rename from services/fluent-bit/0.19.17/defaults/cm.yaml rename to services/fluent-bit/0.19.22/defaults/cm.yaml index d498d9c12..9a64220c0 100644 --- a/services/fluent-bit/0.19.17/defaults/cm.yaml +++ b/services/fluent-bit/0.19.22/defaults/cm.yaml @@ -2,14 +2,14 @@ apiVersion: v1 kind: ConfigMap metadata: - name: fluent-bit-0.19.17-d2iq-defaults + name: fluent-bit-0.19.22-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | --- # overriding the default image tag to be consistent with logging-operator image: - tag: 1.8.9 + tag: 1.8.14 resources: limits: diff --git a/services/fluent-bit/0.19.17/defaults/kustomization.yaml b/services/fluent-bit/0.19.22/defaults/kustomization.yaml similarity index 100% rename from services/fluent-bit/0.19.17/defaults/kustomization.yaml rename to services/fluent-bit/0.19.22/defaults/kustomization.yaml diff --git a/services/fluent-bit/0.19.17/fluent-bit.yaml b/services/fluent-bit/0.19.22/fluent-bit.yaml similarity index 90% rename from services/fluent-bit/0.19.17/fluent-bit.yaml rename to services/fluent-bit/0.19.22/fluent-bit.yaml index 5b0257982..8172b79b3 100644 --- a/services/fluent-bit/0.19.17/fluent-bit.yaml +++ b/services/fluent-bit/0.19.22/fluent-bit.yaml @@ -14,7 +14,7 @@ spec: namespace: kommander-flux # This chart version should be kept in sync with logging-operator. # Both services should deploy the same version of fluent-bit. - version: 0.19.17 + version: 0.19.22 interval: 15s install: remediation: @@ -26,4 +26,4 @@ spec: releaseName: kommander-fluent-bit valuesFrom: - kind: ConfigMap - name: fluent-bit-0.19.17-d2iq-defaults + name: fluent-bit-0.19.22-d2iq-defaults diff --git a/services/fluent-bit/0.19.17/kustomization.yaml b/services/fluent-bit/0.19.22/kustomization.yaml similarity index 100% rename from services/fluent-bit/0.19.17/kustomization.yaml rename to services/fluent-bit/0.19.22/kustomization.yaml diff --git a/services/kommander-appmanagement/0.2.0/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.2.0/kommander-appmanagement.yaml index 5ef1fe79c..32605ce31 100644 --- a/services/kommander-appmanagement/0.2.0/kommander-appmanagement.yaml +++ b/services/kommander-appmanagement/0.2.0/kommander-appmanagement.yaml @@ -12,7 +12,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-kommander-charts namespace: kommander-flux - version: "${kommanderChartVersion:=v2.2.0-rc.3}" + version: "${kommanderChartVersion:=v2.2.0-rc.4}" interval: 15s install: remediation: diff --git a/services/kommander/0.2.0/defaults/cm.yaml b/services/kommander/0.2.0/defaults/cm.yaml index 035a69c8e..e89752142 100644 --- a/services/kommander/0.2.0/defaults/cm.yaml +++ b/services/kommander/0.2.0/defaults/cm.yaml @@ -98,3 +98,4 @@ data: cert-manager: "1.7.1" karma-traefik: "0.0.1" gatekeeper: "3.7.0" + kommander-flux: "0.27.4" diff --git a/services/kommander/0.2.0/kommander.yaml b/services/kommander/0.2.0/kommander.yaml index a071ddbbc..ee98dcee9 100644 --- a/services/kommander/0.2.0/kommander.yaml +++ b/services/kommander/0.2.0/kommander.yaml @@ -17,7 +17,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-kommander-charts namespace: kommander-flux - version: "${kommanderChartVersion:=v2.2.0-rc.3}" + version: "${kommanderChartVersion:=v2.2.0-rc.4}" interval: 15s # Kommander is quite a big chart and it may need some more time than # other charts to get ready so setting this to 10 minutes increases diff --git a/services/logging-operator/3.17.2/defaults/cm.yaml b/services/logging-operator/3.17.3/defaults/cm.yaml similarity index 95% rename from services/logging-operator/3.17.2/defaults/cm.yaml rename to services/logging-operator/3.17.3/defaults/cm.yaml index 51509dbcc..b8d1ed662 100644 --- a/services/logging-operator/3.17.2/defaults/cm.yaml +++ b/services/logging-operator/3.17.3/defaults/cm.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: logging-operator-3.17.2-d2iq-defaults + name: logging-operator-3.17.3-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -26,7 +26,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: logging-operator-logging-3.17.2-d2iq-defaults + name: logging-operator-logging-3.17.3-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -96,8 +96,9 @@ data: fluentbit: image: # Explicitly use the default image. This should be updated when logging-operator is upgraded. + # Also, update the image in fluent-bit configuration if the image is upgraded here. repository: fluent/fluent-bit - tag: 1.8.13 + tag: 1.8.14 resources: limits: memory: 750Mi diff --git a/services/logging-operator/3.17.2/defaults/kustomization.yaml b/services/logging-operator/3.17.3/defaults/kustomization.yaml similarity index 100% rename from services/logging-operator/3.17.2/defaults/kustomization.yaml rename to services/logging-operator/3.17.3/defaults/kustomization.yaml diff --git a/services/logging-operator/3.17.2/kustomization.yaml b/services/logging-operator/3.17.3/kustomization.yaml similarity index 100% rename from services/logging-operator/3.17.2/kustomization.yaml rename to services/logging-operator/3.17.3/kustomization.yaml diff --git a/services/logging-operator/3.17.2/logging-operator-logging.yaml b/services/logging-operator/3.17.3/logging-operator-logging.yaml similarity index 84% rename from services/logging-operator/3.17.2/logging-operator-logging.yaml rename to services/logging-operator/3.17.3/logging-operator-logging.yaml index e06083cac..b515f0144 100644 --- a/services/logging-operator/3.17.2/logging-operator-logging.yaml +++ b/services/logging-operator/3.17.3/logging-operator-logging.yaml @@ -15,7 +15,7 @@ spec: kind: HelmRepository name: kubernetes-charts.banzaicloud.com namespace: kommander-flux - version: 3.17.2 + version: 3.17.3 interval: 15s install: remediation: @@ -26,10 +26,10 @@ spec: releaseName: logging-operator-logging valuesFrom: - kind: ConfigMap - name: logging-operator-logging-3.17.2-d2iq-defaults + name: logging-operator-logging-3.17.3-d2iq-defaults # FIXME: To make logging-operator-logging work properly with federated # overrides, the `logging-operator` app should be split into two, - # after which this enntry should be replaced with `configOverrides` + # after which this entry should be replaced with `configOverrides` # in the AppDeployment - kind: ConfigMap name: logging-operator-logging-overrides diff --git a/services/logging-operator/3.17.2/logging-operator.yaml b/services/logging-operator/3.17.3/logging-operator.yaml similarity index 89% rename from services/logging-operator/3.17.2/logging-operator.yaml rename to services/logging-operator/3.17.3/logging-operator.yaml index 761e69622..0689dbbd4 100644 --- a/services/logging-operator/3.17.2/logging-operator.yaml +++ b/services/logging-operator/3.17.3/logging-operator.yaml @@ -13,7 +13,7 @@ spec: name: kubernetes-charts.banzaicloud.com namespace: kommander-flux # When upgrading, make sure to update the fluent-bit and fluentd images in logging-operator-logging.yaml. - version: 3.17.2 + version: 3.17.3 interval: 15s install: remediation: @@ -24,4 +24,4 @@ spec: releaseName: logging-operator valuesFrom: - kind: ConfigMap - name: logging-operator-3.17.2-d2iq-defaults + name: logging-operator-3.17.3-d2iq-defaults