Skip to content

Commit

Permalink
feat: remove all references to rbac-manager (#198)
Browse files Browse the repository at this point in the history
removing all templates, config and references to the rbac-manager service

Signed-off-by: Arvind Somya <[email protected]>
  • Loading branch information
asomya authored and Btodhunter committed Apr 4, 2024
1 parent 3b12801 commit fac223a
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 764 deletions.

This file was deleted.

2 changes: 1 addition & 1 deletion stable/enterprise/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: enterprise
version: "2.4.2"
version: "2.4.3"
appVersion: "5.3.0"
kubeVersion: 1.23.x - 1.28.x || 1.23.x-x - 1.29.x-x
description: |
Expand Down
27 changes: 1 addition & 26 deletions stable/enterprise/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ stringData:
[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) serves as the gateway to expose HTTP and HTTPS routes from outside the Kubernetes cluster to services within it. Routing is governed by rules specified in the Ingress resource. Kubernetes supports a variety of ingress controllers, such as AWS ALB and GCE controllers.
This Helm chart includes a foundational ingress configuration that is customizable. You can expose various Anchore Enterprise external APIs, including the core API, UI, reporting, RBAC, and feeds, by editing the `ingress` section in your values file.
This Helm chart includes a foundational ingress configuration that is customizable. You can expose various Anchore Enterprise external APIs, including the core API, UI, reporting, and feeds, by editing the `ingress` section in your values file.
Ingress is disabled by default in this Helm chart. To enable it, along with the [NGINX ingress controller](https://kubernetes.github.io/ingress-nginx/) for core API and UI routes, set the `ingress.enabled` value to `true`.
Expand Down Expand Up @@ -582,11 +582,6 @@ spec:
interval: 30s
path: /metrics
scheme: http
# RBAC manager
- targetPort: 8229
interval: 30s
path: /metrics
scheme: http
```
### Scaling Individual Services
Expand Down Expand Up @@ -687,7 +682,6 @@ The Anchore Enterprise Helm chart introduces several changes to the deployment c
- `<RELEASE_NAME>-anchore-engine-catalog` -> `<RELEASE_NAME>-enterprise-catalog`
- `<RELEASE_NAME>-anchore-engine-enterprise-feeds` -> `<RELEASE_NAME>-feeds`
- `<RELEASE_NAME>-anchore-engine-enterprise-notifications` -> `<RELEASE_NAME>-enterprise-notifications`
- `<RELEASE_NAME>-anchore-engine-enterprise-rbac` -> `<RELEASE_NAME>-enterprise-rbac-manager`
- `<RELEASE_NAME>-anchore-engine-enterprise-reports` -> `<RELEASE_NAME>-enterprise-reports`
- `<RELEASE_NAME>-anchore-engine-enterprise-ui` -> `<RELEASE_NAME>-enterprise-ui`
- `<RELEASE_NAME>-anchore-engine-policy` -> `<RELEASE_NAME>-enterprise-policy`
Expand Down Expand Up @@ -1177,25 +1171,6 @@ This rollback procedure is designed to revert your environment to its pre-migrat
| `policyEngine.scratchVolume.details` | Details for the k8s volume to be created for Anchore Policy Engine scratch space | `{}` |
### Anchore RBAC Manager Parameters
| Name | Description | Value |
| --------------------------------- | ------------------------------------------------------------- | ----------- |
| `rbacManager.replicaCount` | Number of replicas for the Anchore RBAC Manager deployment | `1` |
| `rbacManager.service.type` | Service type for Anchore RBAC Manager | `ClusterIP` |
| `rbacManager.service.port` | Service port for Anchore RBAC Manager | `8229` |
| `rbacManager.service.annotations` | Annotations for Anchore RBAC Manager service | `{}` |
| `rbacManager.service.labels` | Labels for Anchore RBAC Manager service | `{}` |
| `rbacManager.service.nodePort` | nodePort for Anchore RBAC Manager service | `""` |
| `rbacManager.extraEnv` | Set extra environment variables for Anchore RBAC Manager pods | `[]` |
| `rbacManager.resources` | Resource requests and limits for Anchore RBAC Manager pods | `{}` |
| `rbacManager.labels` | Labels for Anchore RBAC Manager pods | `{}` |
| `rbacManager.annotations` | Annotation for Anchore RBAC Manager pods | `{}` |
| `rbacManager.nodeSelector` | Node labels for Anchore RBAC Manager pod assignment | `{}` |
| `rbacManager.tolerations` | Tolerations for Anchore RBAC Manager pod assignment | `[]` |
| `rbacManager.affinity` | Affinity for Anchore RBAC Manager pod assignment | `{}` |
| `rbacManager.serviceAccountName` | Service account name for Anchore RBAC Manager pods | `""` |
### Anchore Reports Parameters
| Name | Description | Value |
Expand Down
11 changes: 0 additions & 11 deletions stable/enterprise/files/default_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,6 @@ services:
ssl_cert: ${ANCHORE_SSL_CERT}
ssl_key: ${ANCHORE_SSL_KEY}

rbac_manager:
enabled: true
require_auth: true
endpoint_hostname: ${ANCHORE_ENDPOINT_HOSTNAME}
listen: '0.0.0.0'
port: ${ANCHORE_PORT}
max_request_threads: ${ANCHORE_MAX_REQUEST_THREADS}
ssl_enable: ${ANCHORE_SSL_ENABLED}
ssl_cert: ${ANCHORE_SSL_CERT}
ssl_key: ${ANCHORE_SSL_KEY}

reports:
enabled: true
require_auth: true
Expand Down
5 changes: 0 additions & 5 deletions stable/enterprise/templates/_names.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- printf "%s-%s-%s" .Release.Name $name "policy"| trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "enterprise.rbacManager.fullname" -}}
{{- $name := default .Chart.Name .Values.global.nameOverride -}}
{{- printf "%s-%s-%s" .Release.Name $name "rbac-manager"| trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "enterprise.reports.fullname" -}}
{{- $name := default .Chart.Name .Values.global.nameOverride -}}
{{- printf "%s-%s-%s" .Release.Name $name "reports"| trunc 63 | trimSuffix "-" -}}
Expand Down
Loading

0 comments on commit fac223a

Please sign in to comment.