Skip to content

Commit 22258a3

Browse files
andrewazoresandrewazores
authored
chore(oauth): deploy upstream openshift oauth-proxy build (#259)
1 parent 36018fb commit 22258a3

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎charts/cryostat/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sources:
3333
- https://github.com/cryostatio/cryostat-grafana-dashboard
3434
- https://github.com/cryostatio/cryostat-db
3535
- https://github.com/cryostatio/cryostat-storage
36-
- https://github.com/cryostatio/openshift-oauth-proxy
36+
- https://github.com/openshift/oauth-proxy
3737
- https://github.com/oauth2-proxy/oauth2-proxy
3838

3939
maintainers:

‎charts/cryostat/README.md‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -283,29 +283,29 @@ certificate issuance and rotation.
283283

284284
### OpenShift OAuth Proxy
285285

286-
| Name | Description | Value |
287-
| ----------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- |
288-
| `openshiftOauthProxy.image.repository` | Repository for the OpenShift OAuth Proxy container image | `quay.io/cryostat/openshift-oauth-proxy` |
289-
| `openshiftOauthProxy.image.pullPolicy` | Image pull policy for the OpenShift OAuth Proxy container image | `Always` |
290-
| `openshiftOauthProxy.image.tag` | Tag for the OpenShift OAuth Proxy container image | `cryostat-v3.0` |
291-
| `openshiftOauthProxy.resources.requests.cpu` | CPU resource request for the OpenShift OAuth Proxy container | `25m` |
292-
| `openshiftOauthProxy.resources.requests.memory` | Memory resource request for the OpenShift OAuth Proxy container | `64Mi` |
293-
| `openshiftOauthProxy.accessReview.enabled` | Whether the SubjectAccessReview/TokenAccessReview role checks for users and clients are enabled. If this is disabled then the proxy will only check that the user has valid credentials or holds a valid token | `true` |
294-
| `openshiftOauthProxy.accessReview.group` | The OpenShift resource group that the SubjectAccessReview/TokenAccessReview will be performed for. See https://github.com/openshift/oauth-proxy/?tab=readme-ov-file#delegate-authentication-and-authorization-to-openshift-for-infrastructure | `""` |
295-
| `openshiftOauthProxy.accessReview.resource` | The OpenShift resource that the SubjectAccessReview/TokenAccessReview will be performed for | `pods` |
296-
| `openshiftOauthProxy.accessReview.subresource` | The OpenShift resource that the SubjectAccessReview/TokenAccessReview will be performed for | `exec` |
297-
| `openshiftOauthProxy.accessReview.name` | The OpenShift resource name that the SubjectAccessReview/TokenAccessReview will be performed for | `""` |
298-
| `openshiftOauthProxy.accessReview.namespace` | The OpenShift namespace that the SubjectAccessReview/TokenAccessReview will be performed for | `{{ .Release.Namespace }}` |
299-
| `openshiftOauthProxy.accessReview.verb` | The OpenShift resource name that the SubjectAccessReview/TokenAccessReview will be performed for | `create` |
300-
| `openshiftOauthProxy.accessReview.version` | The OpenShift resource version that the SubjectAccessReview/TokenAccessReview will be performed for | `""` |
301-
| `openshiftOauthProxy.securityContext` | Security Context for the OpenShift OAuth Proxy container. Defaults to meet "restricted" [Pod Security Standard](https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted). See: [SecurityContext](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) | `{}` |
302-
| `openshiftOauthProxy.config.extra` | Extra configurations for the OpenShift OAuth Proxy | |
303-
| `openshiftOauthProxy.config.extra.envVars` | Extra environment variables for the OpenShift OAuth Proxy. See: [Define Environment Variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/) | `[]` |
304-
| `openshiftOauthProxy.config.extra.envSources` | Sources for extra variables for the OpenShift OAuth Proxy. See: [Define Environment Variables From ConfigMap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables) | `[]` |
305-
| `openshiftOauthProxy.config.extra.inPod.main.envVars` | Extra environment variables for the OpenShift OAuth Proxy **only in the Cryostat main pod** | `[]` |
306-
| `openshiftOauthProxy.config.extra.inPod.main.envSources` | Sources for extra variables for the OpenShift OAuth Proxy **only in the Cryostat main pod** | `[]` |
307-
| `openshiftOauthProxy.config.extra.inPod.reports.envVars` | Extra environment variables for the OpenShift OAuth Proxy **only in the report generator pods** | `[]` |
308-
| `openshiftOauthProxy.config.extra.inPod.reports.envSources` | Sources for extra variables for the OpenShift OAuth Proxy **only in the report generator pods** | `[]` |
286+
| Name | Description | Value |
287+
| ----------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------- |
288+
| `openshiftOauthProxy.image.repository` | Repository for the OpenShift OAuth Proxy container image | `quay.io/openshift/origin-oauth-proxy` |
289+
| `openshiftOauthProxy.image.pullPolicy` | Image pull policy for the OpenShift OAuth Proxy container image | `Always` |
290+
| `openshiftOauthProxy.image.tag` | Tag for the OpenShift OAuth Proxy container image | `latest` |
291+
| `openshiftOauthProxy.resources.requests.cpu` | CPU resource request for the OpenShift OAuth Proxy container | `25m` |
292+
| `openshiftOauthProxy.resources.requests.memory` | Memory resource request for the OpenShift OAuth Proxy container | `64Mi` |
293+
| `openshiftOauthProxy.accessReview.enabled` | Whether the SubjectAccessReview/TokenAccessReview role checks for users and clients are enabled. If this is disabled then the proxy will only check that the user has valid credentials or holds a valid token | `true` |
294+
| `openshiftOauthProxy.accessReview.group` | The OpenShift resource group that the SubjectAccessReview/TokenAccessReview will be performed for. See https://github.com/openshift/oauth-proxy/?tab=readme-ov-file#delegate-authentication-and-authorization-to-openshift-for-infrastructure | `""` |
295+
| `openshiftOauthProxy.accessReview.resource` | The OpenShift resource that the SubjectAccessReview/TokenAccessReview will be performed for | `pods` |
296+
| `openshiftOauthProxy.accessReview.subresource` | The OpenShift resource that the SubjectAccessReview/TokenAccessReview will be performed for | `exec` |
297+
| `openshiftOauthProxy.accessReview.name` | The OpenShift resource name that the SubjectAccessReview/TokenAccessReview will be performed for | `""` |
298+
| `openshiftOauthProxy.accessReview.namespace` | The OpenShift namespace that the SubjectAccessReview/TokenAccessReview will be performed for | `{{ .Release.Namespace }}` |
299+
| `openshiftOauthProxy.accessReview.verb` | The OpenShift resource name that the SubjectAccessReview/TokenAccessReview will be performed for | `create` |
300+
| `openshiftOauthProxy.accessReview.version` | The OpenShift resource version that the SubjectAccessReview/TokenAccessReview will be performed for | `""` |
301+
| `openshiftOauthProxy.securityContext` | Security Context for the OpenShift OAuth Proxy container. Defaults to meet "restricted" [Pod Security Standard](https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted). See: [SecurityContext](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) | `{}` |
302+
| `openshiftOauthProxy.config.extra` | Extra configurations for the OpenShift OAuth Proxy | |
303+
| `openshiftOauthProxy.config.extra.envVars` | Extra environment variables for the OpenShift OAuth Proxy. See: [Define Environment Variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/) | `[]` |
304+
| `openshiftOauthProxy.config.extra.envSources` | Sources for extra variables for the OpenShift OAuth Proxy. See: [Define Environment Variables From ConfigMap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables) | `[]` |
305+
| `openshiftOauthProxy.config.extra.inPod.main.envVars` | Extra environment variables for the OpenShift OAuth Proxy **only in the Cryostat main pod** | `[]` |
306+
| `openshiftOauthProxy.config.extra.inPod.main.envSources` | Sources for extra variables for the OpenShift OAuth Proxy **only in the Cryostat main pod** | `[]` |
307+
| `openshiftOauthProxy.config.extra.inPod.reports.envVars` | Extra environment variables for the OpenShift OAuth Proxy **only in the report generator pods** | `[]` |
308+
| `openshiftOauthProxy.config.extra.inPod.reports.envSources` | Sources for extra variables for the OpenShift OAuth Proxy **only in the report generator pods** | `[]` |
309309

310310
### Other Parameters
311311

‎charts/cryostat/tests/cryostat_deployment_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ tests:
526526
asserts:
527527
- matchRegex:
528528
path: spec.template.spec.containers[?(@.name=='cryostat-authproxy')].image
529-
pattern: "quay.io/cryostat/openshift-oauth-proxy:.*"
529+
pattern: "quay.io/openshift/origin-oauth-proxy:.*"
530530

531531
- it: should configure the OAuth2 Proxy when OpenShift OAuth is disabled and OAuth2 is enabled
532532
set:

0 commit comments

Comments
 (0)