Merge remote-tracking branch 'upstream/master' into all_ns

Makefile

@@ -54,7 +54,7 @@ release-controllers:
 	./hack/generators/release-controllers/generate-release-controllers.py .
 
 checkconfig:
-	$(CONTAINER_ENGINE) run --rm -v "$(CURDIR):/release:z" gcr.io/k8s-prow/checkconfig:v20210927-8d536b6b41 --config-path /release/core-services/prow/02_config/_config.yaml --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient
+	$(CONTAINER_ENGINE) run --rm -v "$(CURDIR):/release:z" gcr.io/k8s-prow/checkconfig:v20211015-ed5bdc5c27 --config-path /release/core-services/prow/02_config/_config.yaml --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient
 
 jobs: ci-operator-checkconfig
 	$(CONTAINER_ENGINE) pull registry.ci.openshift.org/ci/ci-operator-prowgen:latest
@@ -288,3 +288,15 @@ config_updater_vault_secret:
 	oc --context "$(cluster)" sa create-kubeconfig -n ci config-updater > "$(build_farm_credentials_folder)/sa.config-updater.$(cluster).config"
 	make ci-secret-generator
 .PHONY: config_updater_vault_secret
+
+# Need to run inside Red Had network
+update_github_ldap_mapping_config_map:
+	ldapsearch -LLL -x -h ldap.corp.redhat.com -b ou=users,dc=redhat,dc=com '(rhatSocialURL=GitHub*)' rhatSocialURL uid 2>&1 | tee /tmp/out
+	$(CONTAINER_ENGINE) pull registry.ci.openshift.org/ci/ldap-users-from-github-owners-files:latest
+	$(CONTAINER_ENGINE) run --rm \
+		-v "/tmp:/tmp:z" \
+		registry.ci.openshift.org/ci/ldap-users-from-github-owners-files:latest \
+		-ldap-file /tmp/out \
+		-mapping-file /tmp/mapping.yaml
+	oc --context app.ci -n ci create configmap github-ldap-mapping --from-file=mapping.yaml=/tmp/mapping.yaml --dry-run=client -o yaml | oc --context app.ci -n ci apply -f -
+.PHONY: update_github_ldap_mapping_config_map

OWNERS

@@ -1,12 +1,9 @@
 approvers:
+- dptp
+- alvaroaleman
+- AlexNPavel
 - stevekuznetsov
 - smarterclayton
-- bbguimaraes
-- droslean
-- hongkailiu
-- petr-muller
-- AlexNPavel
-- alvaroaleman
-- emilvberglind
-- smg247
 - jupierce
+reviewers:
+- dptp