From 5c386086592bf0be6906aa05e878c88859c544e6 Mon Sep 17 00:00:00 2001
From: Andrew Shoell <andrew.shoell.ctr@us.af.mil>
Date: Thu, 16 May 2024 00:34:09 +0000
Subject: [PATCH] Resolve "Implement Istio Authorization Policies"
---
CHANGELOG.md | 4 ++++
README.md | 10 +++++-----
chart/Chart.yaml | 2 +-
chart/values.yaml | 8 ++++----
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4671d5cc6..d63ef5773 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [7.11.1-bb.2] (2024-05-15)
+### Changed
+- Changed the istio sidecar inject back to false so gitlab can come up
+
## [7.11.1-bb.1] (2024-05-13)
### Removed
- Removed the kubeversion from chart
diff --git a/README.md b/README.md
index 3325b17d5..8bd609383 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# gitlab
- 
+ 
GitLab is the most comprehensive AI-powered DevSecOps Platform.
@@ -411,7 +411,7 @@ helm install gitlab chart/
| upgradeCheck.securityContext.runAsGroup | int | `65534` | |
| upgradeCheck.securityContext.fsGroup | int | `65534` | |
| upgradeCheck.tolerations | list | `[]` | |
-| upgradeCheck.annotations."sidecar.istio.io/inject" | string | `"true"` | |
+| upgradeCheck.annotations."sidecar.istio.io/inject" | string | `"false"` | |
| upgradeCheck.configMapAnnotations | object | `{}` | |
| upgradeCheck.resources.requests.cpu | string | `"500m"` | |
| upgradeCheck.resources.requests.memory | string | `"500Mi"` | |
@@ -792,7 +792,7 @@ helm install gitlab chart/
| shared-secrets.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | |
| shared-secrets.tolerations | list | `[]` | |
| shared-secrets.podLabels | object | `{}` | |
-| shared-secrets.annotations."sidecar.istio.io/inject" | string | `"true"` | |
+| shared-secrets.annotations."sidecar.istio.io/inject" | string | `"false"` | |
| gitlab-runner.install | bool | `false` | |
| gitlab-runner.rbac.create | bool | `true` | |
| gitlab-runner.runners.locked | bool | `false` | |
@@ -860,7 +860,7 @@ helm install gitlab chart/
| gitlab.gitlab-exporter.containerSecurityContext.runAsUser | int | `1000` | |
| gitlab.gitlab-exporter.containerSecurityContext.runAsGroup | int | `1000` | |
| gitlab.gitlab-exporter.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | |
-| gitlab.migrations.annotations."sidecar.istio.io/inject" | string | `"true"` | |
+| gitlab.migrations.annotations."sidecar.istio.io/inject" | string | `"false"` | |
| gitlab.migrations.init.resources.limits.cpu | string | `"500m"` | |
| gitlab.migrations.init.resources.limits.memory | string | `"768Mi"` | |
| gitlab.migrations.init.resources.requests.cpu | string | `"500m"` | |
@@ -1010,7 +1010,7 @@ helm install gitlab chart/
| minio.containerSecurityContext.runAsGroup | int | `1000` | |
| minio.containerSecurityContext.runAsNonRoot | bool | `true` | |
| minio.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | |
-| minio.jobAnnotations."sidecar.istio.io/inject" | string | `"true"` | |
+| minio.jobAnnotations."sidecar.istio.io/inject" | string | `"false"` | |
| minio.image | string | `"registry1.dso.mil/ironbank/opensource/minio/minio"` | |
| minio.imageTag | string | `"RELEASE.2022-12-12T19-27-27Z"` | |
| minio.pullSecrets[0].name | string | `"private-registry"` | |
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 748f331cb..2e8a56f0b 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,7 +1,7 @@
---
apiVersion: v1
name: gitlab
-version: 7.11.1-bb.1
+version: 7.11.1-bb.2
appVersion: 16.11.1
description: GitLab is the most comprehensive AI-powered DevSecOps Platform.
keywords:
diff --git a/chart/values.yaml b/chart/values.yaml
index 4a66caf20..3d3449a9e 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -940,7 +940,7 @@ upgradeCheck:
# - ALL
tolerations: []
annotations:
- sidecar.istio.io/inject: "true"
+ sidecar.istio.io/inject: "false"
configMapAnnotations: {}
resources:
requests:
@@ -1486,7 +1486,7 @@ shared-secrets:
tolerations: []
podLabels: {}
annotations:
- sidecar.istio.io/inject: "true"
+ sidecar.istio.io/inject: "false"
## Installation & configuration of gitlab/gitlab-runner
## See requirements.yaml for current version
@@ -1653,7 +1653,7 @@ gitlab:
migrations:
# istio sidecar injection for the migration job causes difficult errors. disable istio for this job
annotations:
- sidecar.istio.io/inject: "true"
+ sidecar.istio.io/inject: "false"
init:
resources:
limits:
@@ -1983,7 +1983,7 @@ minio:
- ALL
# Additional job annotations
jobAnnotations:
- sidecar.istio.io/inject: "true"
+ sidecar.istio.io/inject: "false"
# use Ironbank hardened images for MinIO
image: registry1.dso.mil/ironbank/opensource/minio/minio
imageTag: RELEASE.2022-12-12T19-27-27Z
--
GitLab