Skip to content

NO-ISSUE: (Manual) Synchronize From Upstream Repositories #214

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

Merged
merged 48 commits into from
Jan 7, 2025
Merged

NO-ISSUE: (Manual) Synchronize From Upstream Repositories #214

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
e5d5c04
:seedling: Bump golang.org/x/crypto from 0.28.0 to 0.31.0 (#1521)
dependabot[bot] Dec 13, 2024
d1db17f
:seedling: Bump markdown2 from 2.5.1 to 2.5.2 (#1519)
dependabot[bot] Dec 13, 2024
61fe142
e2e: add tests to validate metrics endpoint (#1522)
camilamacedo86 Dec 13, 2024
3cd783a
:seedling: Bump certifi from 2024.8.30 to 2024.12.14 (#1526)
dependabot[bot] Dec 16, 2024
7ad65d6
:seedling: Bump mkdocs-material from 9.5.48 to 9.5.49 (#1525)
dependabot[bot] Dec 16, 2024
d3f267a
Configure ENVTEST Binaries for IDE Debugging (#1454)
camilamacedo86 Dec 17, 2024
06bddaf
Adding deprecation notice to roadmap (#1528)
LalatenduMohanty Dec 17, 2024
cd290ba
Add check for client in e2e (#1529)
tmshort Dec 17, 2024
b67bd38
:seedling: Bump helm.sh/helm/v3 from 3.16.3 to 3.16.4 (#1527)
dependabot[bot] Dec 17, 2024
10f0f77
Replace kube-rbac-proxy to ensure the same level of protection with c…
camilamacedo86 Dec 19, 2024
de6a813
(fix) Removing Unused and Insecure Manifests for Prometheus since its…
camilamacedo86 Jan 3, 2025
2c812aa
move service to kustomize manager dir, rename for general purpose use…
joelanford Jan 6, 2025
afe582b
Merge branch 'main' into synchronize
joelanford Jan 6, 2025
b3f6af1
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
4c69d7c
UPSTREAM: <carry>: Drop commitchecker
awgreene Nov 3, 2023
c850c4b
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 16, 2023
1405c02
UPSTREAM: <carry>: update owners
Mar 27, 2024
bae5f4d
UPSTREAM: <carry>: Add pointer to tooling README
bentito Apr 1, 2024
e001e1c
UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
Apr 26, 2024
fcc2e64
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Mar 27, 2024
96a01e2
UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
Apr 30, 2024
7d2ed01
UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
liouk May 2, 2024
88a2462
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
May 25, 2024
0a1d865
UPSTREAM: <carry>: add everettraven to approvers+reviewers
everettraven Jun 24, 2024
e38dfd4
UPSTREAM: <carry>: add openshift kustomize overlay
everettraven Jul 9, 2024
9c14cc5
UPSTREAM: <carry>: Add tmshort to approvers
tmshort Sep 11, 2024
7ca3c22
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Sep 18, 2024
6c86607
UPSTREAM: <carry>: Properly copy and call kustomize
tmshort Sep 23, 2024
ae55b79
UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
joelanford Sep 20, 2024
f7c7fc9
UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be …
dtfranz Sep 26, 2024
f26d8e2
UPSTREAM: <carry>: Add downstream verify makefile target
dtfranz Sep 27, 2024
6f12a85
UPSTREAM: <carry>: openshift: template log verbosity to be managed by…
joelanford Sep 28, 2024
9dc03ee
UPSTREAM: <carry>: Add global-pull-secret flag
Oct 8, 2024
657169b
UPSTREAM: <carry>: Update openshift CAs to operator-controller
tmshort Oct 28, 2024
67e5f40
UPSTREAM: <carry>: Add HowTo for origin tests
tmshort Nov 1, 2024
c508578
UPSTREAM: <carry>: Add e2e registry Dockerfile
dtfranz Nov 16, 2024
95ace89
UPSTREAM: <carry>: add nodeSelector and tolerations to operator-contr…
everettraven Nov 19, 2024
5555857
UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn l…
joelanford Nov 22, 2024
68b3859
UPSTREAM: <carry>: Enable downstream e2e
dtfranz Nov 15, 2024
9a1b812
UPSTREAM: <carry>: Remove m1kola from owners
Dec 12, 2024
f0d170b
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 4, 2024
43c0b0a
UPSTREAM: <drop>: go mod vendor
joelanford Jan 6, 2025
77d06b8
UPSTREAM: <drop>: remove upstream GitHub configuration
joelanford Jan 6, 2025
4ce783b
UPSTREAM: <drop>: configure the commit-checker
joelanford Jan 6, 2025
ee1cc93
UPSTREAM: <drop>: rewrite go mod
joelanford Jan 6, 2025
c0b0ccc
UPSTREAM: <carry>: generate and mount service-ca server cert
joelanford Jan 6, 2025
deabcc2
UPSTREAM: <drop>: re-generate manifests for service-ca cert
joelanford Jan 6, 2025
f37f9eb
UPSTREAM: <drop>: improved metrics test output to troubleshoot failure
joelanford Jan 6, 2025
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
8 changes: 8 additions & 0 deletions openshift/kustomize/overlays/openshift/olmv1-ns/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ resources:
- ../../../../../config/base/manager

patches:
- target:
kind: Service
name: service
path: patches/manager_service.yaml
- target:
kind: ClusterRole
name: manager-role
Expand All @@ -15,6 +19,10 @@ patches:
kind: Deployment
name: controller-manager
path: patches/manager_deployment_ca.yaml
- target:
kind: Deployment
name: controller-manager
path: patches/manager_deployment_certs.yaml
- target:
kind: Deployment
name: controller-manager
Expand Down
12 changes: 12 additions & 0 deletions openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- op: add
path: /spec/template/spec/volumes/-
value: {"name":"operator-controller-certs", "secret":{"optional":false,"secretName":"operator-controller-cert"}}
- op: add
path: /spec/template/spec/containers/0/volumeMounts/-
value: {"name":"operator-controller-certs", "mountPath":"/var/certs"}
- op: add
path: /spec/template/spec/containers/0/args/-
value: "--tls-cert=/var/certs/tls.crt"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know there was an issue upstream with tls.crt vs. tls.cert, and I want to make sure this is working fine. I believe it had to do with the HTTPS client seeing tls.key and not finding tls.cert, because the CAs and the server certs were in the same directory. Something to look out for, if this fails badly (or strangely).

- op: add
path: /spec/template/spec/containers/0/args/-
value: "--tls-key=/var/certs/tls.key"
4 changes: 4 additions & 0 deletions openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- op: add
path: /metadata/annotations
value:
service.beta.openshift.io/serving-cert-secret-name: operator-controller-cert