Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove specification of user id for the Redis workload #5863

Merged
merged 4 commits into from
Apr 2, 2021
Merged

chore: Remove specification of user id for the Redis workload #5863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0325eb6
fix: avoid specifying redis user
sbose78 Mar 25, 2021
95ef44f
fix: generate manifests
sbose78 Mar 25, 2021
fedce66
Merge branch 'master' of https://github.com/argoproj/argo-cd into rem…
sbose78 Apr 1, 2021
ee28373
chore: one less manifest
sbose78 Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions manifests/base/redis/argocd-redis-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
app.kubernetes.io/name: argocd-redis
spec:
securityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
runAsNonRoot: true
serviceAccountName: argocd-redis
containers:
Expand Down
17 changes: 0 additions & 17 deletions manifests/base/redis/argocd-redis-role.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion manifests/base/redis/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: Kustomization

resources:
- argocd-redis-deployment.yaml
- argocd-redis-role.yaml
- argocd-redis-rolebinding.yaml
- argocd-redis-sa.yaml
- argocd-redis-service.yaml
Expand Down
16 changes: 1 addition & 15 deletions manifests/ha/base/redis-ha/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,7 @@ patchesJson6902:
kind: ConfigMap
name: argocd-redis-ha-configmap
namespace: argocd
path: overlays/remove-namespace.yaml
- target:
group: rbac.authorization.k8s.io
version: v1
kind: Role
name: argocd-redis-ha
namespace: argocd
path: overlays/add-openshift-nonroot-scc.yaml
- target:
group: rbac.authorization.k8s.io
version: v1
kind: Role
name: argocd-redis-ha-haproxy
namespace: argocd
path: overlays/add-openshift-nonroot-scc.yaml
path: overlays/remove-namespace.yaml
- target:
version: v1
group: ""
Expand Down
11 changes: 0 additions & 11 deletions manifests/ha/base/redis-ha/overlays/add-openshift-nonroot-scc.yaml
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions manifests/ha/base/redis-ha/overlays/redis-ha-haproxy.yaml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions manifests/ha/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,14 +2136,6 @@ rules:
- endpoints
verbs:
- get
- apiGroups:
- security.openshift.io
resourceNames:
- nonroot
resources:
- securitycontextconstraints
verbs:
- use
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -2162,14 +2154,6 @@ rules:
- endpoints
verbs:
- get
- apiGroups:
- security.openshift.io
resourceNames:
- nonroot
resources:
- securitycontextconstraints
verbs:
- use
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
16 changes: 0 additions & 16 deletions manifests/ha/namespace-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,14 +2136,6 @@ rules:
- endpoints
verbs:
- get
- apiGroups:
- security.openshift.io
resourceNames:
- nonroot
resources:
- securitycontextconstraints
verbs:
- use
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -2162,14 +2154,6 @@ rules:
- endpoints
verbs:
- get
- apiGroups:
- security.openshift.io
resourceNames:
- nonroot
resources:
- securitycontextconstraints
verbs:
- use
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
21 changes: 0 additions & 21 deletions manifests/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,24 +2114,6 @@ rules:
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/component: redis
app.kubernetes.io/name: argocd-redis
app.kubernetes.io/part-of: argocd
name: argocd-redis
rules:
- apiGroups:
- security.openshift.io
resourceNames:
- nonroot
resources:
- securitycontextconstraints
verbs:
- use
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/component: server
Expand Down Expand Up @@ -2599,10 +2581,7 @@ spec:
ports:
- containerPort: 6379
securityContext:
fsGroup: 1000
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
serviceAccountName: argocd-redis
---
apiVersion: apps/v1
Expand Down
21 changes: 0 additions & 21 deletions manifests/namespace-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,24 +2114,6 @@ rules:
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/component: redis
app.kubernetes.io/name: argocd-redis
app.kubernetes.io/part-of: argocd
name: argocd-redis
rules:
- apiGroups:
- security.openshift.io
resourceNames:
- nonroot
resources:
- securitycontextconstraints
verbs:
- use
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/component: server
Expand Down Expand Up @@ -2514,10 +2496,7 @@ spec:
ports:
- containerPort: 6379
securityContext:
fsGroup: 1000
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
serviceAccountName: argocd-redis
---
apiVersion: apps/v1
Expand Down
2 changes: 1 addition & 1 deletion reposerver/repository/repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {
q := apiclient.ManifestRequest{Repo: &argoappv1.Repository{}, ApplicationSource: &src}

// update this value if we add/remove manifests
const countOfManifests = 29
const countOfManifests = 28

res1, err := service.GenerateManifest(context.Background(), &q)

Expand Down