diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 635c12f5a5..ebc9b6f6f4 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 5.1.0-0.nightly-arm64-2026-10-19-220957 +OCP_VERSION := 5.1.0-0.nightly-arm64-2026-10-21-160957 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index ef84d0e08b..3d89b21aab 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 5.1.0-0.nightly-2026-10-18-125305 +OCP_VERSION := 5.1.0-0.nightly-2026-10-21-040310 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index e7fb70e653..13506e18e6 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:1000ffbeb015b565e21f8c9654085f6e6b4991ad47f84f5f312d2933e3c05647 + digest: sha256:5c650dd8cdde224472edb0eb2a43e028386700b01c83143d18e2335fa9635e6a - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:01243ff4b2f36d3a4e89dea5383cd7d5d3160236605b74c47084a7964fb3f6eb + digest: sha256:0bd07462e8746bc6b55246475066189c579473a0396b92362b4f4d2ce9e7137c diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 0f39fe0e4b..ca0f6949b8 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:5d64a930dde949e04d93094d54129032ecd322e452fcf6bc53354b223e514d58 + digest: sha256:8ef5a5d78948bf65f633e0d4dda52cc2b7c4dfa8edf30ab2c40b1938c6717c12 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:836ede399096f0c2fea9afb227a80e7f68f5c667be6a770799cc853e6c21b3b2 + digest: sha256:a7c2e2233ebad570d127daa9ea337ac42a588c3fa820b1291bf74a658007046e diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 4cd7f7e7b6..d3630fc14e 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "5.1.0-0.nightly-arm64-2026-10-19-220957" + "base": "5.1.0-0.nightly-arm64-2026-10-21-160957" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1000ffbeb015b565e21f8c9654085f6e6b4991ad47f84f5f312d2933e3c05647", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:01243ff4b2f36d3a4e89dea5383cd7d5d3160236605b74c47084a7964fb3f6eb" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5c650dd8cdde224472edb0eb2a43e028386700b01c83143d18e2335fa9635e6a", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0bd07462e8746bc6b55246475066189c579473a0396b92362b4f4d2ce9e7137c" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 9b1a869379..2f0e2f468c 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "5.1.0-0.nightly-2026-10-18-125305" + "base": "5.1.0-0.nightly-2026-10-21-040310" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5d64a930dde949e04d93094d54129032ecd322e452fcf6bc53354b223e514d58", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:836ede399096f0c2fea9afb227a80e7f68f5c667be6a770799cc853e6c21b3b2" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ef5a5d78948bf65f633e0d4dda52cc2b7c4dfa8edf30ab2c40b1938c6717c12", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a7c2e2233ebad570d127daa9ea337ac42a588c3fa820b1291bf74a658007046e" } } diff --git a/assets/optional/ai-model-serving/runtimes/kustomization.yaml b/assets/optional/ai-model-serving/runtimes/kustomization.yaml index 069a0fedf7..85bb03cd91 100644 --- a/assets/optional/ai-model-serving/runtimes/kustomization.yaml +++ b/assets/optional/ai-model-serving/runtimes/kustomization.yaml @@ -9,5 +9,4 @@ resources: - hf-detector.yaml - ovms-kserve.yaml - vllm-cuda.yaml -- vllm-gaudi.yaml - vllm-rocm.yaml diff --git a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml deleted file mode 100644 index 761d832ff9..0000000000 --- a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: serving.kserve.io/v1alpha1 -kind: ServingRuntime -metadata: - name: vllm-gaudi-runtime - annotations: - openshift.io/display-name: vLLM Intel Gaudi Accelerator ServingRuntime for KServe - opendatahub.io/recommended-accelerators: '["habana.ai/gaudi"]' - opendatahub.io/runtime-version: 'v0.14.1' - labels: - opendatahub.io/dashboard: 'true' -spec: - annotations: - opendatahub.io/kserve-runtime: 'vllm' - prometheus.io/port: '8080' - prometheus.io/path: '/metrics' - multiModel: false - supportedModelFormats: - - autoSelect: false - name: vLLM - builtInAdapter: - modelLoadingTimeoutMillis: 90000 - containers: - - name: kserve-container - image: vllm-gaudi-image - command: - - python - - -m - - vllm.entrypoints.openai.api_server - args: - - "--port=8080" - - "--model=/mnt/models" - - "--served-model-name={{.Name}}" - env: - - name: HF_HOME - value: /tmp/hf_home - ports: - - containerPort: 8080 - protocol: TCP diff --git a/assets/optional/kube-state-metrics/kustomization.aarch64.yaml b/assets/optional/kube-state-metrics/kustomization.aarch64.yaml index 60ed9f2ac6..a69c90881e 100644 --- a/assets/optional/kube-state-metrics/kustomization.aarch64.yaml +++ b/assets/optional/kube-state-metrics/kustomization.aarch64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:4110578bdec57980a1bfead540787dc32b7b265ccb6d6810b9b461c01c90f8c1 + digest: sha256:eff13d5b131c996946f64459807c1c317eb48cf79341c6eb7b8ba3c7f54df95d - name: quay.io/openshift/kube-state-metrics newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:0272a2a496f3f7b0a7a6e3ef9cebcd4bc8b2c42b155cfb9ebfe2e893ab1712e7 + digest: sha256:8c8283f92afc7304d64e4390812ed6786b410fc11f478dc8a30e23e7eefd5045 diff --git a/assets/optional/kube-state-metrics/kustomization.x86_64.yaml b/assets/optional/kube-state-metrics/kustomization.x86_64.yaml index cd913e9fc8..3039e32f0a 100644 --- a/assets/optional/kube-state-metrics/kustomization.x86_64.yaml +++ b/assets/optional/kube-state-metrics/kustomization.x86_64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:1317cc0ec7f4006f90f4bf502b624b75b940809694a787abdb42d92371318482 + digest: sha256:4f723b0668e2c173003c5bb4bec87b085c490e3693493d8dcd625bda686142e1 - name: quay.io/openshift/kube-state-metrics newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:e5c031aa945c386125bf2c382c5922a941e1201d6627f95841494ae00bd380ca + digest: sha256:f6084d7b219ef05e1cfa0ba0f11219ffcb071d2f6ab7629a87e7f89fb7779e07 diff --git a/assets/optional/kube-state-metrics/release-kube-state-metrics-aarch64.json b/assets/optional/kube-state-metrics/release-kube-state-metrics-aarch64.json index 11f8db052e..9b46586e5d 100644 --- a/assets/optional/kube-state-metrics/release-kube-state-metrics-aarch64.json +++ b/assets/optional/kube-state-metrics/release-kube-state-metrics-aarch64.json @@ -1,8 +1,8 @@ { "release": { - "base": "5.1.0-0.nightly-arm64-2026-10-19-220957" + "base": "5.1.0-0.nightly-arm64-2026-10-21-160957" }, "images": { - "kube_state_metrics": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0272a2a496f3f7b0a7a6e3ef9cebcd4bc8b2c42b155cfb9ebfe2e893ab1712e7" + "kube_state_metrics": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8c8283f92afc7304d64e4390812ed6786b410fc11f478dc8a30e23e7eefd5045" } } diff --git a/assets/optional/kube-state-metrics/release-kube-state-metrics-x86_64.json b/assets/optional/kube-state-metrics/release-kube-state-metrics-x86_64.json index f9a37ef6b2..b376615ea8 100644 --- a/assets/optional/kube-state-metrics/release-kube-state-metrics-x86_64.json +++ b/assets/optional/kube-state-metrics/release-kube-state-metrics-x86_64.json @@ -1,8 +1,8 @@ { "release": { - "base": "5.1.0-0.nightly-2026-10-18-125305" + "base": "5.1.0-0.nightly-2026-10-21-040310" }, "images": { - "kube_state_metrics": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e5c031aa945c386125bf2c382c5922a941e1201d6627f95841494ae00bd380ca" + "kube_state_metrics": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f6084d7b219ef05e1cfa0ba0f11219ffcb071d2f6ab7629a87e7f89fb7779e07" } } diff --git a/assets/optional/metrics-server/kustomization.aarch64.yaml b/assets/optional/metrics-server/kustomization.aarch64.yaml index 480fb2fc07..938fb813ba 100644 --- a/assets/optional/metrics-server/kustomization.aarch64.yaml +++ b/assets/optional/metrics-server/kustomization.aarch64.yaml @@ -1,4 +1,4 @@ images: - name: quay.io/openshift/kube-metrics-server newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:4b35ad11a25be99e36b05d8d153e8367e9ea1e3afd64dfb5ba74ccf0af3cb216 + digest: sha256:27af3616aad53be63d03569ed2a5d8a9d3efcca005e29096a793ec11c6ff02a1 diff --git a/assets/optional/metrics-server/kustomization.x86_64.yaml b/assets/optional/metrics-server/kustomization.x86_64.yaml index c9f0b35164..a488cece97 100644 --- a/assets/optional/metrics-server/kustomization.x86_64.yaml +++ b/assets/optional/metrics-server/kustomization.x86_64.yaml @@ -1,4 +1,4 @@ images: - name: quay.io/openshift/kube-metrics-server newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:8ee324c110f2e2d4f37e8c1f824a19c18845123b75b04e81bbd270525eb9e458 + digest: sha256:dbfc1f04f6ae8a645f015c53baab1629603526e0e53be038c5c14250e5298c8d diff --git a/assets/optional/metrics-server/release-metrics-server-aarch64.json b/assets/optional/metrics-server/release-metrics-server-aarch64.json index 6698f3438b..5102aa687f 100644 --- a/assets/optional/metrics-server/release-metrics-server-aarch64.json +++ b/assets/optional/metrics-server/release-metrics-server-aarch64.json @@ -1,8 +1,8 @@ { "release": { - "base": "5.1.0-0.nightly-arm64-2026-10-19-220957" + "base": "5.1.0-0.nightly-arm64-2026-10-21-160957" }, "images": { - "metrics_server": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4b35ad11a25be99e36b05d8d153e8367e9ea1e3afd64dfb5ba74ccf0af3cb216" + "metrics_server": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:27af3616aad53be63d03569ed2a5d8a9d3efcca005e29096a793ec11c6ff02a1" } } diff --git a/assets/optional/metrics-server/release-metrics-server-x86_64.json b/assets/optional/metrics-server/release-metrics-server-x86_64.json index 718dccf87b..5f306b1e39 100644 --- a/assets/optional/metrics-server/release-metrics-server-x86_64.json +++ b/assets/optional/metrics-server/release-metrics-server-x86_64.json @@ -1,8 +1,8 @@ { "release": { - "base": "5.1.0-0.nightly-2026-10-18-125305" + "base": "5.1.0-0.nightly-2026-10-21-040310" }, "images": { - "metrics_server": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ee324c110f2e2d4f37e8c1f824a19c18845123b75b04e81bbd270525eb9e458" + "metrics_server": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dbfc1f04f6ae8a645f015c53baab1629603526e0e53be038c5c14250e5298c8d" } } diff --git a/assets/optional/node-exporter/kustomization.aarch64.yaml b/assets/optional/node-exporter/kustomization.aarch64.yaml index 80b791ca1d..c773b7362a 100644 --- a/assets/optional/node-exporter/kustomization.aarch64.yaml +++ b/assets/optional/node-exporter/kustomization.aarch64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:4110578bdec57980a1bfead540787dc32b7b265ccb6d6810b9b461c01c90f8c1 + digest: sha256:eff13d5b131c996946f64459807c1c317eb48cf79341c6eb7b8ba3c7f54df95d - name: quay.io/openshift/node-exporter newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:e046d816e3a1e01f32cda2388eeb88289f499c279925f427da565c2daeff1696 + digest: sha256:e57f7ed5bf325160c4292608c668d185c38a891296d47c161371b88a219d6fbd diff --git a/assets/optional/node-exporter/kustomization.x86_64.yaml b/assets/optional/node-exporter/kustomization.x86_64.yaml index ca77940c58..1c2ac93883 100644 --- a/assets/optional/node-exporter/kustomization.x86_64.yaml +++ b/assets/optional/node-exporter/kustomization.x86_64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:1317cc0ec7f4006f90f4bf502b624b75b940809694a787abdb42d92371318482 + digest: sha256:4f723b0668e2c173003c5bb4bec87b085c490e3693493d8dcd625bda686142e1 - name: quay.io/openshift/node-exporter newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:71174206d6a435b8f8072089ce699c287c83283009601319287fb4b8c5337210 + digest: sha256:9fb110d4291dcc5cd5c2076c659dac03a2cb1d06999f38b7e858b6aaa0ae878a diff --git a/assets/optional/node-exporter/release-node-exporter-aarch64.json b/assets/optional/node-exporter/release-node-exporter-aarch64.json index 048360fed5..9142bff988 100644 --- a/assets/optional/node-exporter/release-node-exporter-aarch64.json +++ b/assets/optional/node-exporter/release-node-exporter-aarch64.json @@ -1,8 +1,8 @@ { "release": { - "base": "5.1.0-0.nightly-arm64-2026-10-19-220957" + "base": "5.1.0-0.nightly-arm64-2026-10-21-160957" }, "images": { - "node_exporter": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e046d816e3a1e01f32cda2388eeb88289f499c279925f427da565c2daeff1696" + "node_exporter": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e57f7ed5bf325160c4292608c668d185c38a891296d47c161371b88a219d6fbd" } } diff --git a/assets/optional/node-exporter/release-node-exporter-x86_64.json b/assets/optional/node-exporter/release-node-exporter-x86_64.json index 911191001c..7a8fa93722 100644 --- a/assets/optional/node-exporter/release-node-exporter-x86_64.json +++ b/assets/optional/node-exporter/release-node-exporter-x86_64.json @@ -1,8 +1,8 @@ { "release": { - "base": "5.1.0-0.nightly-2026-10-18-125305" + "base": "5.1.0-0.nightly-2026-10-21-040310" }, "images": { - "node_exporter": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:71174206d6a435b8f8072089ce699c287c83283009601319287fb4b8c5337210" + "node_exporter": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9fb110d4291dcc5cd5c2076c659dac03a2cb1d06999f38b7e858b6aaa0ae878a" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index ecd6fa891f..82fea4aa15 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:cce144bdbb645f16f3f43941f04b7737c283ad55d2c2db76623e2d89b2f298cc + digest: sha256:8d175127f8ca33662d4bf35ac87d762beee3ce120584bc2316f85ccab53ce0c9 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:497b5ce36b410e14f76bb221d3a04f8acd52c466aa1a8674850807ebb17bbe4e + digest: sha256:e9f3cbfadbef726bf5b328b5d1d6f03e4b9e486670e19791b31dda450d6397a3 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:4110578bdec57980a1bfead540787dc32b7b265ccb6d6810b9b461c01c90f8c1 + digest: sha256:eff13d5b131c996946f64459807c1c317eb48cf79341c6eb7b8ba3c7f54df95d patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:497b5ce36b410e14f76bb221d3a04f8acd52c466aa1a8674850807ebb17bbe4e + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e9f3cbfadbef726bf5b328b5d1d6f03e4b9e486670e19791b31dda450d6397a3 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cce144bdbb645f16f3f43941f04b7737c283ad55d2c2db76623e2d89b2f298cc + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8d175127f8ca33662d4bf35ac87d762beee3ce120584bc2316f85ccab53ce0c9 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index d25e2986f6..f7b843d599 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:f6ed7b40784f543c91e32fbf6c7c0c540ca4d1c2cbd1bf4952540095833f5890 + digest: sha256:f9d907fc3d98285455941d91d7c7ee1844ac19b186333ab5586a0065405a6e85 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:e5d930110101f0d647c8fa7087c11acdf692c1cd3e121c2bae33d1f6aeae3faf + digest: sha256:e72e72fdde8264a5f24fa070a5b72dc9b89ea44bc292aed44f07eb88413f7e5a - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:1317cc0ec7f4006f90f4bf502b624b75b940809694a787abdb42d92371318482 + digest: sha256:4f723b0668e2c173003c5bb4bec87b085c490e3693493d8dcd625bda686142e1 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e5d930110101f0d647c8fa7087c11acdf692c1cd3e121c2bae33d1f6aeae3faf + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e72e72fdde8264a5f24fa070a5b72dc9b89ea44bc292aed44f07eb88413f7e5a - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f6ed7b40784f543c91e32fbf6c7c0c540ca4d1c2cbd1bf4952540095833f5890 + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f9d907fc3d98285455941d91d7c7ee1844ac19b186333ab5586a0065405a6e85 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 7485062c5e..58144201ef 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "5.1.0-0.nightly-arm64-2026-10-19-220957" + "base": "5.1.0-0.nightly-arm64-2026-10-21-160957" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cce144bdbb645f16f3f43941f04b7737c283ad55d2c2db76623e2d89b2f298cc", - "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:497b5ce36b410e14f76bb221d3a04f8acd52c466aa1a8674850807ebb17bbe4e", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4110578bdec57980a1bfead540787dc32b7b265ccb6d6810b9b461c01c90f8c1" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8d175127f8ca33662d4bf35ac87d762beee3ce120584bc2316f85ccab53ce0c9", + "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e9f3cbfadbef726bf5b328b5d1d6f03e4b9e486670e19791b31dda450d6397a3", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:eff13d5b131c996946f64459807c1c317eb48cf79341c6eb7b8ba3c7f54df95d" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 7a2f110aa4..12a610c54e 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "5.1.0-0.nightly-2026-10-18-125305" + "base": "5.1.0-0.nightly-2026-10-21-040310" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f6ed7b40784f543c91e32fbf6c7c0c540ca4d1c2cbd1bf4952540095833f5890", - "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e5d930110101f0d647c8fa7087c11acdf692c1cd3e121c2bae33d1f6aeae3faf", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1317cc0ec7f4006f90f4bf502b624b75b940809694a787abdb42d92371318482" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f9d907fc3d98285455941d91d7c7ee1844ac19b186333ab5586a0065405a6e85", + "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e72e72fdde8264a5f24fa070a5b72dc9b89ea44bc292aed44f07eb88413f7e5a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4f723b0668e2c173003c5bb4bec87b085c490e3693493d8dcd625bda686142e1" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 8168eb6175..142de0ca04 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "5.1.0-0.nightly-arm64-2026-10-19-220957" + "base": "5.1.0-0.nightly-arm64-2026-10-21-160957" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3f613e527319af1df5d9639dc6e834a8a2b28f7d8d4eab188b25843247c563a7", - "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cfbf315662aba7015623b89ee48e831015867919b1fb28f01ca17bebc74470e5", + "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1e91ba2e8e003a3a4ad24cdd001fa153a007b01d3158ca49a8e18e9d642006f6", + "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:11fbab3d8bd18611a5a4ba0bcabf2af77be63204e310809f9dee7bd478790141", "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:52b06c9cda67be0f8ed8365905bb786f42380b84a147aa4c77fe2b8b0bc3e41e", "haproxy-router-haproxy32": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:157e575ed8209ec96fcf9315c2f7c7c971c0443c4d7382d9dc04b786d8cbe4d4", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4110578bdec57980a1bfead540787dc32b7b265ccb6d6810b9b461c01c90f8c1", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:36325ef5e41bcd4cd83469818b70b3a7640247ef128ce6f0698ffcd570981ea9", - "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d95d3c2a00e4a98c443901dc3d4bd22d0da2e3ba93b130d8fce74b0a554bd217", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a684390f37ab90ddfdd07b7193b0f704b98352c5ce0b1dcee52bf4f2f0530415", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:eff13d5b131c996946f64459807c1c317eb48cf79341c6eb7b8ba3c7f54df95d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2ea94d72319cea18d24e5dacb664d7bbde55a8a7b6e4464a0fa1534588951960", + "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:998ce44fa809241ddda5bb8d18635d3d6c24063be20dfee20db3c9a08115ceb4", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c2aa65bb9389855827bd77d9f36561e4712365db68fb7ae7a9ab789025ab14dc", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1a1562cba5ce840b6a5a0d501e7a16eaef1df2cd4136a13f8aa418cc554dad89" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0deb80632f3c5e2aa9434f42f766fe11aff4ce16a8952486710a4e769a0c3035" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index f280d5912b..b66c4a6bae 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "5.1.0-0.nightly-2026-10-18-125305" + "base": "5.1.0-0.nightly-2026-10-21-040310" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f9889006ab9ebbebc0f41095ceefca8448eb29d28ee55418a441e4c1581d106b", - "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2123d0236dc8b6329f366cbea6c47ef3ebb6bc02f4ada061848eea81e0fb82c3", + "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3cf7b7da130d358fc44b004a986a5591e1f580eb474b1d946cff480f6852b70d", + "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:01538e96f72e6dd9cbe94745a3af1e45addbf98b24d7a829e05fbb5bae639f09", "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:05669754ad422a6126c6d366644130d83d88d0e4ca8af577dad72cd11a28231f", "haproxy-router-haproxy32": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:38b986da8070e8a5e2227b5e47bd39941caf7934172e490b97e212916ca93cae", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1317cc0ec7f4006f90f4bf502b624b75b940809694a787abdb42d92371318482", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6defee30b370411f2043872a8c827878cd5101dbd15c8578b77cac1979ca94b5", - "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2e364d7ccd15761d3f8e62d8848ff5c406d9791b7b810b8cf44085f26b5284a4", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:83cb4e9f94f023ad7153e014044899c5a418ef9c79d9c859829af8995d3b3ed3", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4f723b0668e2c173003c5bb4bec87b085c490e3693493d8dcd625bda686142e1", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a9d8150daa09cfba2ec13ab0910673d4049343311c18496955136c1963c9cc13", + "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:65433c1f5e09b2896a657cc5098bb890e00be51438fb27a1f73ab6dd92c6e34b", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5062b1c62fccdcec3ed6d6584e00fd17cb1a4a05ace54841e8dec11da56437a8", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1aa04d92d388df9ac4a50a03570a9bca2cb884cbd559799b4494a57a9330ffbf" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0bded3e83570c3aa1b056df861b1e32b2348f1254df15e4e66c4425abb6cee6b" } } diff --git a/cbom-microshift.json b/cbom-microshift.json index b5e40f4a44..4260ef645a 100644 --- a/cbom-microshift.json +++ b/cbom-microshift.json @@ -1,24 +1,24 @@ { "bomFormat": "CycloneDX", "specVersion": "1.6", - "serialNumber": "urn:uuid:439ad6ff-b6e4-42df-bc4b-fb77f6ed932f", + "serialNumber": "urn:uuid:4b54ce09-cb8b-40ab-9190-7146ad81507f", "version": 1, "metadata": { - "timestamp": "2026-10-20T04:29:14Z", + "timestamp": "2026-10-22T17:54:41Z", "tools": { "components": [ { "type": "application", "group": "SCANOSS", "name": "crypto-finder", - "version": "1.26.7" + "version": "1.26.10" } ] } }, "components": [ { - "bom-ref": "bc8ac16d-ac4d-4c6c-8d61-3ce7dad05529", + "bom-ref": "b2a0d557-a654-4083-abc6-30c5ac69304c", "type": "cryptographic-asset", "name": "AES", "properties": [ @@ -118,7 +118,7 @@ } }, { - "bom-ref": "8d821df0-2d37-484e-845f-09f8c9563fa1", + "bom-ref": "474cdebc-73a5-40c5-b223-0c483a0662e1", "type": "cryptographic-asset", "name": "AES-GCM", "evidence": { @@ -155,7 +155,7 @@ } }, { - "bom-ref": "55458985-22ae-43af-8a3e-dcf04cf4d12a", + "bom-ref": "5335c834-d914-4a34-acbf-a5135a6b30f8", "type": "cryptographic-asset", "name": "Blowfish", "properties": [ @@ -237,7 +237,7 @@ } }, { - "bom-ref": "6f917399-5149-4743-9927-34e8d4200fb8", + "bom-ref": "fae96317-7481-4662-b378-6abf0a18ac1f", "type": "cryptographic-asset", "name": "CSHAKE128", "properties": [ @@ -288,7 +288,7 @@ } }, { - "bom-ref": "47875117-8004-4c92-aa6e-3a75f600e109", + "bom-ref": "99b5543f-8184-4851-ac5e-b383d47cac02", "type": "cryptographic-asset", "name": "CSHAKE256", "properties": [ @@ -339,7 +339,7 @@ } }, { - "bom-ref": "e33edd1e-a118-4f5c-84e1-b9ce77ecf182", + "bom-ref": "96d45fcb-a523-4be1-a6d3-d3e341036c84", "type": "cryptographic-asset", "name": "ECDH-", "properties": [ @@ -399,7 +399,7 @@ } }, { - "bom-ref": "c8e3a21b-e030-4019-8291-94d764aaec8c", + "bom-ref": "76959162-5ebc-4995-8ba2-e1ba72c1e4de", "type": "cryptographic-asset", "name": "ECDSA", "properties": [ @@ -666,7 +666,7 @@ } }, { - "bom-ref": "9da1d13b-d9b7-4305-80e2-d944c27d64ae", + "bom-ref": "c36343ab-998b-4f5f-8179-0543a8ac1ca6", "type": "cryptographic-asset", "name": "ECDSA-P256", "properties": [ @@ -732,7 +732,7 @@ } }, { - "bom-ref": "47e8b196-fd95-408d-b7b2-2170b5e2c7ed", + "bom-ref": "d214039f-bc81-42b7-b054-ce35cf30d768", "type": "cryptographic-asset", "name": "ECDSA-P384", "properties": [ @@ -778,7 +778,7 @@ } }, { - "bom-ref": "a780f1ed-0026-4bf7-a9ed-97e7495c04d4", + "bom-ref": "eb6dd2d7-437b-4d3e-a9ff-992979f0b194", "type": "cryptographic-asset", "name": "ECDSA-P521", "properties": [ @@ -834,7 +834,7 @@ } }, { - "bom-ref": "3807a537-518f-42f2-85de-dfdbf7657936", + "bom-ref": "7a064768-5646-4e72-8ff9-5bf2e0159bd3", "type": "cryptographic-asset", "name": "Ed25519", "properties": [ @@ -1038,7 +1038,7 @@ } }, { - "bom-ref": "40d4c99c-7edc-4f18-b05f-6a7fd0fd7437", + "bom-ref": "b560e52c-5916-4686-94c2-5a7748d1df66", "type": "cryptographic-asset", "name": "HKDF-", "properties": [ @@ -1099,7 +1099,7 @@ } }, { - "bom-ref": "8457aa4a-9bef-4707-9c19-ac4bd7bac2a7", + "bom-ref": "6419ef64-b78d-473d-a299-bd36f2ef4b75", "type": "cryptographic-asset", "name": "HMAC", "properties": [ @@ -1149,7 +1149,7 @@ } }, { - "bom-ref": "ee357c22-9146-4a3e-9ad1-4d0573e88190", + "bom-ref": "8e11213e-38c6-4f58-87d5-1c3fc654fb59", "type": "cryptographic-asset", "name": "HMAC-", "properties": [ @@ -1214,7 +1214,7 @@ } }, { - "bom-ref": "5e50d207-e477-4dbb-9f4e-1a8a852f868f", + "bom-ref": "2141afc0-7e19-4b48-b820-607b7c46c182", "type": "cryptographic-asset", "name": "HMAC-md5", "properties": [ @@ -1259,7 +1259,7 @@ } }, { - "bom-ref": "369213f1-12c0-4f00-a634-4539d3e5895a", + "bom-ref": "7161d945-5c15-4704-a413-432a18cd4cc5", "type": "cryptographic-asset", "name": "HMAC-sha1", "properties": [ @@ -1304,7 +1304,7 @@ } }, { - "bom-ref": "4f347352-dd43-4917-9011-86f1efd93eb9", + "bom-ref": "0409c5bf-328c-4ee5-bfdd-e16c0bc41ec6", "type": "cryptographic-asset", "name": "HMAC-sha256", "properties": [ @@ -1359,7 +1359,7 @@ } }, { - "bom-ref": "09577065-eb2b-472c-9aee-a4bb268f3353", + "bom-ref": "28b7a00b-f59b-4e3e-8d39-53ec788c99ca", "type": "cryptographic-asset", "name": "HMAC-sha512", "properties": [ @@ -1409,7 +1409,7 @@ } }, { - "bom-ref": "389a853e-bcb7-4861-aa0b-c22755b0fbc6", + "bom-ref": "e65965c3-b9ee-4868-b6ac-8f1009bf8d71", "type": "cryptographic-asset", "name": "HSalsa20", "properties": [ @@ -1454,7 +1454,7 @@ } }, { - "bom-ref": "3097e06b-92dd-444b-8555-a305cc18d77e", + "bom-ref": "0d47fc27-7791-4e3f-bd8a-fbee90b615c2", "type": "cryptographic-asset", "name": "Keccak-256", "properties": [ @@ -1500,7 +1500,7 @@ } }, { - "bom-ref": "3a64d9b2-aaa4-41a7-95b9-21da6dba4c24", + "bom-ref": "d3614fd7-45a8-48e1-90f5-65aac4998bb5", "type": "cryptographic-asset", "name": "MD4", "properties": [ @@ -1551,7 +1551,7 @@ } }, { - "bom-ref": "87c53fae-4aa8-4eea-a615-1266ed699b6d", + "bom-ref": "5fc61d9f-5637-4e43-a320-7dfe5da0f085", "type": "cryptographic-asset", "name": "MD5", "properties": [ @@ -1627,7 +1627,7 @@ } }, { - "bom-ref": "1ad9f216-f4a0-4330-868b-425efdd19209", + "bom-ref": "21c17756-d65f-45b8-81a6-53b1741c1c46", "type": "cryptographic-asset", "name": "PBKDF2---", "properties": [ @@ -1704,7 +1704,7 @@ } }, { - "bom-ref": "e48bfdff-c558-4211-a99d-b17d1cfb491f", + "bom-ref": "a67d823f-31ad-43c7-8616-ff62b9ce1f2a", "type": "cryptographic-asset", "name": "SHA-1", "properties": [ @@ -1870,7 +1870,7 @@ } }, { - "bom-ref": "48eee912-0075-4299-816b-7f59d297e85b", + "bom-ref": "bc756e7e-359d-478c-a3d7-a4bf0c2fac83", "type": "cryptographic-asset", "name": "SHA-224", "properties": [ @@ -1916,7 +1916,7 @@ } }, { - "bom-ref": "fad01363-808c-4163-9f88-ce1a3742ac8a", + "bom-ref": "fa618871-dd8e-4cda-939a-e5720f116f4e", "type": "cryptographic-asset", "name": "SHA-256", "properties": [ @@ -2347,7 +2347,7 @@ } }, { - "bom-ref": "c09c272a-04be-473f-9ca6-c64fd54e1dc6", + "bom-ref": "9e2ddcf5-71f9-43b2-a451-f50de435bda4", "type": "cryptographic-asset", "name": "SHA-3-224", "properties": [ @@ -2398,7 +2398,7 @@ } }, { - "bom-ref": "9f485193-bfb6-470b-b1b3-c737afd52715", + "bom-ref": "0edf2678-ad80-4472-ae92-a4d3d2339652", "type": "cryptographic-asset", "name": "SHA-3-256", "properties": [ @@ -2449,7 +2449,7 @@ } }, { - "bom-ref": "5c55420f-a7ba-4394-b29b-4901e63d0031", + "bom-ref": "78a134cf-2111-4669-8489-99422abe50c4", "type": "cryptographic-asset", "name": "SHA-3-384", "properties": [ @@ -2500,7 +2500,7 @@ } }, { - "bom-ref": "11a9446c-26b7-4720-80fc-2459f194617f", + "bom-ref": "d8b38fef-a4ae-4f0b-ac6a-dc686bd59d2c", "type": "cryptographic-asset", "name": "SHA-3-512", "properties": [ @@ -2551,7 +2551,7 @@ } }, { - "bom-ref": "58edb85b-d5a9-4fab-b1ce-b45cdac6e009", + "bom-ref": "de9a5d90-9d1c-4e92-b37b-237102ae461f", "type": "cryptographic-asset", "name": "SHA-384", "properties": [ @@ -2677,7 +2677,7 @@ } }, { - "bom-ref": "07e253a0-8899-4b88-9fda-6a2d03186524", + "bom-ref": "5e05ca43-c442-4f67-b99f-22b502464959", "type": "cryptographic-asset", "name": "SHA-512", "properties": [ @@ -2838,7 +2838,7 @@ } }, { - "bom-ref": "2b0f1dae-67f5-44a5-a459-ef697443dcf4", + "bom-ref": "40fbcf8b-b58b-45f5-82e2-9e7b250cc857", "type": "cryptographic-asset", "name": "SHA-512/256", "properties": [ @@ -2884,7 +2884,7 @@ } }, { - "bom-ref": "e7e3f5db-6056-4beb-8638-d5cdd618f1c0", + "bom-ref": "dfbbfe66-d039-4c8c-a0db-bb8da502c424", "type": "cryptographic-asset", "name": "SHAKE128", "properties": [ @@ -2930,7 +2930,7 @@ } }, { - "bom-ref": "6a23dbd8-c45b-4845-97f7-c96c1cc22e6a", + "bom-ref": "19b52233-0aee-49cd-9952-ac669cc60dcf", "type": "cryptographic-asset", "name": "SHAKE256", "properties": [ @@ -2976,7 +2976,7 @@ } }, { - "bom-ref": "8bb81758-d068-4af3-b4bf-605907f3df47", + "bom-ref": "5ce41cc1-6ca2-438c-93df-94b19f069403", "type": "cryptographic-asset", "name": "Salsa20", "evidence": { @@ -3027,7 +3027,7 @@ } }, { - "bom-ref": "93470c3d-7c06-4c5d-9d18-93a55a8741f4", + "bom-ref": "bdd8db35-fbf6-485e-a4f1-8d69266b5866", "type": "cryptographic-asset", "name": "XSalsa20-Poly1305", "properties": [ @@ -3098,7 +3098,7 @@ } }, { - "bom-ref": "a23a8941-b773-4137-947a-069a61dd5c2d", + "bom-ref": "bdd56297-6ea0-4cdb-ad6e-ab487a4e0d00", "type": "cryptographic-asset", "name": "bcrypt", "properties": [ @@ -3169,7 +3169,7 @@ } }, { - "bom-ref": "f0237613-8648-43c7-b589-d5754d2a6565", + "bom-ref": "843d4348-9f25-4f76-8c37-3caeeee858ba", "type": "cryptographic-asset", "name": "certificate:1001:1001::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3188,7 +3188,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1001, "additionalContext": "scanoss:match,clientCrt, err := ca.SignCertificate(clientTemplate, clientPublicKey)" } @@ -3202,7 +3202,7 @@ } }, { - "bom-ref": "02c7a50e-8887-4e77-b746-55461971c4ca", + "bom-ref": "8be6ac29-e4e0-4a95-9ece-12cb43decf5b", "type": "cryptographic-asset", "name": "certificate:1001:1001::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3221,7 +3221,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1001, "additionalContext": "scanoss:match,clientCrt, err := ca.SignCertificate(clientTemplate, clientPublicKey)" } @@ -3235,7 +3235,7 @@ } }, { - "bom-ref": "a4a58250-0f04-479b-a6f7-788e4bf3659d", + "bom-ref": "d1d5b2ac-1334-4fb2-a155-a67a359a8158", "type": "cryptographic-asset", "name": "certificate:1002:1002::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3268,7 +3268,7 @@ } }, { - "bom-ref": "fa0b7d8e-f94b-4f7b-a7b1-9b8bc950dad3", + "bom-ref": "de263e1f-6c3f-48c1-ab43-f400c547fe6c", "type": "cryptographic-asset", "name": "certificate:1002:1002::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3301,7 +3301,7 @@ } }, { - "bom-ref": "7a9d6280-9523-4d41-9cf8-3c0a33a46343", + "bom-ref": "8fbf8200-4447-4bd6-9b37-b7137c620eb8", "type": "cryptographic-asset", "name": "certificate:1003:1003::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3320,7 +3320,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1003, "additionalContext": "scanoss:match,return nil, err" } @@ -3334,7 +3334,7 @@ } }, { - "bom-ref": "12e6f546-300c-4f2e-88d6-d8f817c0e341", + "bom-ref": "fc35da3e-1e6f-4e02-8e32-093a7d69f9ac", "type": "cryptographic-asset", "name": "certificate:1003:1003::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3353,7 +3353,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1003, "additionalContext": "scanoss:match,return nil, err" } @@ -3367,7 +3367,7 @@ } }, { - "bom-ref": "c4b14ee3-53cf-4090-8765-8676cd040a97", + "bom-ref": "6ad9db91-85e5-405c-a650-da9ffe7afe40", "type": "cryptographic-asset", "name": "certificate:1006:1006::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3386,7 +3386,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1006, "additionalContext": "scanoss:match,certData, err := EncodeCertificates(clientCrt)" } @@ -3400,7 +3400,7 @@ } }, { - "bom-ref": "356e4a83-433b-41dd-9b24-3328433777b7", + "bom-ref": "f6734bea-f0b9-4cd9-b19e-8251add9b225", "type": "cryptographic-asset", "name": "certificate:1006:1006::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3419,7 +3419,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1006, "additionalContext": "scanoss:match,certData, err := EncodeCertificates(clientCrt)" } @@ -3433,7 +3433,7 @@ } }, { - "bom-ref": "fec59cd9-9b70-4778-94d8-ab5bfe441de0", + "bom-ref": "93d45531-3a82-49a8-8287-e7cab569c96a", "type": "cryptographic-asset", "name": "certificate:1007:1007::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3466,7 +3466,7 @@ } }, { - "bom-ref": "295013d9-16db-4262-8ded-63f67fb04cf2", + "bom-ref": "a437d489-587e-4ab4-a7c2-deb23db75e89", "type": "cryptographic-asset", "name": "certificate:1007:1007::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3499,7 +3499,7 @@ } }, { - "bom-ref": "2624f9fc-6995-4dae-aee2-81bceee54613", + "bom-ref": "104e3e76-b8ad-4f1e-a0fd-be934786925f", "type": "cryptographic-asset", "name": "certificate:1008:1008::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3532,7 +3532,7 @@ } }, { - "bom-ref": "4c28becb-e42a-4230-94b0-e1469c176974", + "bom-ref": "036bd6b4-a55f-49ed-a506-277e4e03cee5", "type": "cryptographic-asset", "name": "certificate:1008:1008::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3565,7 +3565,7 @@ } }, { - "bom-ref": "02a549c7-4649-423a-ae48-7a2a7af4971e", + "bom-ref": "ae4c2e80-80c3-4108-af96-e104a14ef59f", "type": "cryptographic-asset", "name": "certificate:1008:1008:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -3596,7 +3596,7 @@ } }, { - "bom-ref": "c42d9cbc-1c7d-4e6b-ac1d-0c80b4ffe873", + "bom-ref": "bf1bf2fc-6f78-480f-8530-2ae3187dc097", "type": "cryptographic-asset", "name": "certificate:1010:1010::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3615,7 +3615,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1010, "additionalContext": "scanoss:match,keyData, err := EncodeKey(clientPrivateKey)" } @@ -3629,7 +3629,7 @@ } }, { - "bom-ref": "ed1d9997-0b73-4dbe-aa2e-211b606c9927", + "bom-ref": "3e824ecb-4d45-4af6-90d7-18d217a1197e", "type": "cryptographic-asset", "name": "certificate:1010:1010::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3648,7 +3648,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1010, "additionalContext": "scanoss:match,keyData, err := EncodeKey(clientPrivateKey)" } @@ -3662,7 +3662,7 @@ } }, { - "bom-ref": "4d674ad6-ee1f-4194-8ae9-039ffd0dd33b", + "bom-ref": "00e18ace-a5da-4769-832e-54369e528be9", "type": "cryptographic-asset", "name": "certificate:1015:1015::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3681,7 +3681,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1015, "additionalContext": "scanoss:match,if err = os.WriteFile(certFile, certData, os.FileMode(0644)); err != nil {" } @@ -3695,7 +3695,7 @@ } }, { - "bom-ref": "413a2fb6-00f0-4dc7-98bb-c6cce5e5b4b4", + "bom-ref": "d37f6b62-9010-4ac2-8150-ece6fc668c1b", "type": "cryptographic-asset", "name": "certificate:1015:1015::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3714,7 +3714,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1015, "additionalContext": "scanoss:match,if err = os.WriteFile(certFile, certData, os.FileMode(0644)); err != nil {" } @@ -3728,7 +3728,7 @@ } }, { - "bom-ref": "b420ddce-567f-440e-8db4-29bd524fdfcd", + "bom-ref": "5eb7ed8a-a471-46ca-90f1-45af9f24a29b", "type": "cryptographic-asset", "name": "certificate:1016:1016::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3761,7 +3761,7 @@ } }, { - "bom-ref": "c721e5a6-2abe-4b3e-8ab4-9115b474b129", + "bom-ref": "9acca101-c16d-47ec-b26d-e1d434890ddc", "type": "cryptographic-asset", "name": "certificate:1016:1016::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3794,7 +3794,7 @@ } }, { - "bom-ref": "f46dac2e-1305-4216-8fe2-7b4974b31fe2", + "bom-ref": "fb99df87-31de-48e3-88d0-aca2fbec46cb", "type": "cryptographic-asset", "name": "certificate:1018:1018::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3827,7 +3827,7 @@ } }, { - "bom-ref": "62cb6050-2cc0-48b3-a120-a9396eba1726", + "bom-ref": "84eaf513-469d-46a8-a78e-4ac988372316", "type": "cryptographic-asset", "name": "certificate:1018:1018::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3860,7 +3860,7 @@ } }, { - "bom-ref": "03be32a6-7f1b-4d64-aa24-70451e470559", + "bom-ref": "50cbde6e-e20a-4552-b50f-cdf198c16f22", "type": "cryptographic-asset", "name": "certificate:101:101:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -3891,7 +3891,7 @@ } }, { - "bom-ref": "aa7068dd-6fc1-4d58-bc07-00112a87134f", + "bom-ref": "eb5828e2-8dd4-4947-8bb7-3909436266ef", "type": "cryptographic-asset", "name": "certificate:1028:1028::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3924,7 +3924,7 @@ } }, { - "bom-ref": "56e8277a-d4b9-4491-8414-adabb70bf5d2", + "bom-ref": "aae5b7ef-a8b3-4f3f-a5a7-0a9149e47f09", "type": "cryptographic-asset", "name": "certificate:1028:1028::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3957,7 +3957,7 @@ } }, { - "bom-ref": "1dec7479-e4fa-49af-a006-cdbd49e128bf", + "bom-ref": "55fc723e-5d3d-42ae-9fc6-eac264895655", "type": "cryptographic-asset", "name": "certificate:1029:1029::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -3976,7 +3976,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1029, "additionalContext": "scanoss:match,if err != nil {" } @@ -3990,7 +3990,7 @@ } }, { - "bom-ref": "83122bdc-e892-4fc2-b903-46b25f934c62", + "bom-ref": "b1841784-fb08-4c0d-9797-f0c8f9e3f789", "type": "cryptographic-asset", "name": "certificate:1029:1029::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4009,7 +4009,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1029, "additionalContext": "scanoss:match,if err != nil {" } @@ -4023,7 +4023,7 @@ } }, { - "bom-ref": "b981e1c2-6d6c-4966-85b0-9620a7bbcf29", + "bom-ref": "82cb0190-1918-4609-96b9-832042e70f00", "type": "cryptographic-asset", "name": "certificate:102:102:algorithmPrimitive=other:api=Certificate.CheckSignature:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -4054,7 +4054,7 @@ } }, { - "bom-ref": "277d5513-b7e1-44b4-b8fa-9241832d5e70", + "bom-ref": "b8ea3320-f973-4cfc-8ade-2fda508f0866", "type": "cryptographic-asset", "name": "certificate:1030:1030::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4087,7 +4087,7 @@ } }, { - "bom-ref": "59eb6243-a25e-4f8b-975a-ed915db282ec", + "bom-ref": "f4a630f0-2ed4-4fcc-9030-6aeeeb5c3068", "type": "cryptographic-asset", "name": "certificate:1030:1030::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4120,7 +4120,7 @@ } }, { - "bom-ref": "6386690c-67ea-428a-8b29-bb98a5d124cb", + "bom-ref": "70472ac9-5705-4e74-9a01-dd6ec4e8bf82", "type": "cryptographic-asset", "name": "certificate:1033:1033::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4139,7 +4139,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1033, "additionalContext": "scanoss:match,certData, err := EncodeCertificates(clientCrt)" } @@ -4153,7 +4153,7 @@ } }, { - "bom-ref": "c672c350-363e-4e0d-b1fe-264762805fa6", + "bom-ref": "26a5ccf0-bd5d-4f21-8352-fbc0cb36a206", "type": "cryptographic-asset", "name": "certificate:1033:1033::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4172,7 +4172,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1033, "additionalContext": "scanoss:match,certData, err := EncodeCertificates(clientCrt)" } @@ -4186,7 +4186,7 @@ } }, { - "bom-ref": "a107ccff-b3b1-4ca4-9a78-f19214d1cbdc", + "bom-ref": "9b2dcc74-43b6-4ba2-b561-b8ac871e7887", "type": "cryptographic-asset", "name": "certificate:1034:1034::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4205,7 +4205,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1034, "additionalContext": "scanoss:match,if err != nil {" } @@ -4219,7 +4219,7 @@ } }, { - "bom-ref": "75518108-7f60-40e8-8bf1-1848b0006e50", + "bom-ref": "7decde64-3fa7-402e-afe7-e0b30d202d76", "type": "cryptographic-asset", "name": "certificate:1034:1034::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4238,7 +4238,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1034, "additionalContext": "scanoss:match,if err != nil {" } @@ -4252,7 +4252,7 @@ } }, { - "bom-ref": "bc04712b-787a-48d4-bd70-3e69d7259262", + "bom-ref": "55629dde-3519-425f-9c22-0152d64c1ef1", "type": "cryptographic-asset", "name": "certificate:1035:1035::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4271,7 +4271,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1035, "additionalContext": "scanoss:match,return nil, err" } @@ -4285,7 +4285,7 @@ } }, { - "bom-ref": "5e2dcb22-59e4-4b58-98fc-f32b384ba087", + "bom-ref": "98b1a4d6-2e54-4544-bb4e-331a1aece84c", "type": "cryptographic-asset", "name": "certificate:1035:1035::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4304,7 +4304,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1035, "additionalContext": "scanoss:match,return nil, err" } @@ -4318,7 +4318,7 @@ } }, { - "bom-ref": "fc5adcd5-0a69-411c-b359-688cf4c37a6d", + "bom-ref": "6037643b-4a3e-47d5-9b25-65a7d6afa6c8", "type": "cryptographic-asset", "name": "certificate:1037:1037::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4337,7 +4337,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1037, "additionalContext": "scanoss:match,keyData, err := EncodeKey(clientPrivateKey)" } @@ -4351,7 +4351,7 @@ } }, { - "bom-ref": "15a5da4d-0023-4956-acb9-8e91bc29c46f", + "bom-ref": "76d86532-403a-4370-9fe8-85c62f60aa60", "type": "cryptographic-asset", "name": "certificate:1037:1037::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4370,7 +4370,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1037, "additionalContext": "scanoss:match,keyData, err := EncodeKey(clientPrivateKey)" } @@ -4384,7 +4384,7 @@ } }, { - "bom-ref": "9776c250-ee54-480e-afe9-c7865ec4e751", + "bom-ref": "85e46224-c5e4-4e58-b73c-ac55f6b474e5", "type": "cryptographic-asset", "name": "certificate:1042:1042::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4417,7 +4417,7 @@ } }, { - "bom-ref": "938cd838-e17a-4508-878c-7ad7e2bbb86b", + "bom-ref": "a4c9204a-14c8-4852-98a3-1a1a2302e0f5", "type": "cryptographic-asset", "name": "certificate:1042:1042::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4450,7 +4450,7 @@ } }, { - "bom-ref": "47eba2d3-9c1d-49bd-84de-ef28f01df790", + "bom-ref": "1cd6f891-1cec-4861-b60e-5eeebd1d178c", "type": "cryptographic-asset", "name": "certificate:108:108:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -4481,7 +4481,7 @@ } }, { - "bom-ref": "70ad345a-4e26-4bbe-bed2-f09e6651d7bd", + "bom-ref": "9dcd5d2e-b832-49b8-be3b-5e721ec345a7", "type": "cryptographic-asset", "name": "certificate:110:110:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -4512,7 +4512,7 @@ } }, { - "bom-ref": "1a760657-9f8e-46d0-9656-a5dbbf1d2bce", + "bom-ref": "35b12aa7-9eac-47c6-888d-0ee81db0d0fa", "type": "cryptographic-asset", "name": "certificate:119:119::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4545,7 +4545,7 @@ } }, { - "bom-ref": "aa8c58c9-c5be-44b7-a50e-ae0878ca8f20", + "bom-ref": "84901e04-11d9-40fd-be48-107f4cc73104", "type": "cryptographic-asset", "name": "certificate:119:119::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4578,7 +4578,7 @@ } }, { - "bom-ref": "5d513c4b-f431-4748-850d-804387b3b92d", + "bom-ref": "193d6674-c54f-40ec-ae2f-a9e878be5a22", "type": "cryptographic-asset", "name": "certificate:120:120::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4611,7 +4611,7 @@ } }, { - "bom-ref": "318b0cf1-b768-4dc8-9f15-67c57c317e70", + "bom-ref": "f68e4365-c23e-4c7c-b7a9-608c869eb8b1", "type": "cryptographic-asset", "name": "certificate:120:120::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4644,7 +4644,7 @@ } }, { - "bom-ref": "eb619080-874a-4cab-ae5e-9cee5d8deda2", + "bom-ref": "e6a568c2-e8de-42eb-9522-20a12de3656c", "type": "cryptographic-asset", "name": "certificate:1217:1217:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -4663,7 +4663,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1217, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -4675,7 +4675,7 @@ } }, { - "bom-ref": "5ea44785-f74a-4226-a605-fa063cdc055a", + "bom-ref": "8a294c1b-ac42-4d4c-88b4-e01cb0d3ee95", "type": "cryptographic-asset", "name": "certificate:1217:1217:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -4694,7 +4694,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1217, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -4706,7 +4706,7 @@ } }, { - "bom-ref": "1ed865ce-9e69-4b7a-b178-3c55f7486e72", + "bom-ref": "929f8d3d-b962-4bae-9b14-64b76c6bc3a2", "type": "cryptographic-asset", "name": "certificate:121:121::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4739,7 +4739,7 @@ } }, { - "bom-ref": "1f867c4d-71bc-44ca-bbed-eb641eb048af", + "bom-ref": "6ef6469e-8291-4b15-a455-bb87df82f2e7", "type": "cryptographic-asset", "name": "certificate:121:121::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4772,7 +4772,7 @@ } }, { - "bom-ref": "7f98f237-9aff-4a00-a600-60997631081c", + "bom-ref": "2b43dbcc-d423-4a5c-a596-f4ee85374984", "type": "cryptographic-asset", "name": "certificate:124:127::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4791,7 +4791,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 124, "additionalContext": "scanoss:match,return \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{cert}, ca.Config.Certs...), Key: privateKey, }, nil" } @@ -4805,7 +4805,7 @@ } }, { - "bom-ref": "dbaa9e0c-28fa-48eb-ad1a-a60179ae2639", + "bom-ref": "8536c9d7-5678-479c-959a-19b9a30a221c", "type": "cryptographic-asset", "name": "certificate:124:127::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -4824,7 +4824,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 124, "additionalContext": "scanoss:match,return \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{cert}, ca.Config.Certs...), Key: privateKey, }, nil" } @@ -4838,7 +4838,7 @@ } }, { - "bom-ref": "4a34e83b-6e5d-4d75-a696-4679a2be2abd", + "bom-ref": "f6b9b930-c1e2-49e1-a748-09bbb5ef03b3", "type": "cryptographic-asset", "name": "certificate:125:125:algorithmPrimitive=other:api=x509.ParseCertificates:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -4869,7 +4869,7 @@ } }, { - "bom-ref": "98f57e93-ce65-4826-b96d-3572c54dc7c1", + "bom-ref": "1a263437-d478-4a89-b790-f09b45296c45", "type": "cryptographic-asset", "name": "certificate:1270:1270:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -4888,7 +4888,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1270, "additionalContext": "scanoss:match,derBytes, err := x509.CreateCertificate(rand.Reader, template, issuer, requestKey, issuerKey)" } @@ -4900,7 +4900,7 @@ } }, { - "bom-ref": "684fac93-7cd3-4f46-b829-5392e4eb7891", + "bom-ref": "fcba0ec5-bd40-4ebe-a666-571e02f4b73d", "type": "cryptographic-asset", "name": "certificate:1270:1270:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -4919,7 +4919,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1270, "additionalContext": "scanoss:match,derBytes, err := x509.CreateCertificate(rand.Reader, template, issuer, requestKey, issuerKey)" } @@ -4931,7 +4931,7 @@ } }, { - "bom-ref": "6f3c4617-14e4-46f6-b7be-42fea3106b85", + "bom-ref": "23f5cb01-874c-4329-82d3-e00447d07d1f", "type": "cryptographic-asset", "name": "certificate:1274:1274:algorithmPrimitive=other:api=x509.ParseCertificates:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -4950,7 +4950,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1274, "additionalContext": "scanoss:match,certs, err := x509.ParseCertificates(derBytes)" } @@ -4962,7 +4962,7 @@ } }, { - "bom-ref": "12f8344e-b2c9-4205-aa9c-901e348a963f", + "bom-ref": "1c3340fc-45f2-4336-884e-455e25b47635", "type": "cryptographic-asset", "name": "certificate:1274:1274:algorithmPrimitive=other:api=x509.ParseCertificates:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -4981,7 +4981,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1274, "additionalContext": "scanoss:match,certs, err := x509.ParseCertificates(derBytes)" } @@ -4993,7 +4993,7 @@ } }, { - "bom-ref": "206aa184-4c26-4735-95d7-a4d6f881da78", + "bom-ref": "35def19b-f11d-42bd-a549-cd7aeee8bb02", "type": "cryptographic-asset", "name": "certificate:1286:1286::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5012,7 +5012,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1286, "additionalContext": "scanoss:match,for _, cert := range certs {" } @@ -5026,7 +5026,7 @@ } }, { - "bom-ref": "7933d4f4-cf14-4670-b206-3430afcc1970", + "bom-ref": "69a4738c-9c90-4276-9477-cba3f4a8a6a9", "type": "cryptographic-asset", "name": "certificate:1286:1286::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5045,7 +5045,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1286, "additionalContext": "scanoss:match,for _, cert := range certs {" } @@ -5059,7 +5059,7 @@ } }, { - "bom-ref": "d7486e00-6345-4838-bfd7-e51286febab9", + "bom-ref": "f474fd99-b1b4-4024-a12b-e89aee902d41", "type": "cryptographic-asset", "name": "certificate:1287:1287::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5092,7 +5092,7 @@ } }, { - "bom-ref": "549ad022-b751-4680-84d9-2a381afa4f29", + "bom-ref": "d51d0eb7-34c3-40b2-bdc5-b0c9fd3fc2e9", "type": "cryptographic-asset", "name": "certificate:1287:1287::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5125,7 +5125,7 @@ } }, { - "bom-ref": "7a6432f6-972f-4c96-88d1-d3e063e19af6", + "bom-ref": "c708c07a-8cb0-4aba-8343-acbb4fff381c", "type": "cryptographic-asset", "name": "certificate:1288:1288::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5144,7 +5144,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1288, "additionalContext": "scanoss:match,return []byte{}, err" } @@ -5158,7 +5158,7 @@ } }, { - "bom-ref": "69487a04-461a-4ae0-81eb-3630f9294e08", + "bom-ref": "19860ed3-9a26-4281-99a6-5eef2cdc93a8", "type": "cryptographic-asset", "name": "certificate:1288:1288::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5177,7 +5177,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 1288, "additionalContext": "scanoss:match,return []byte{}, err" } @@ -5191,7 +5191,7 @@ } }, { - "bom-ref": "5a331c3e-655b-4d54-ab0b-556df91aeed0", + "bom-ref": "cc6928ab-3bf6-4796-8dce-da290feca32a", "type": "cryptographic-asset", "name": "certificate:138:138:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -5222,7 +5222,7 @@ } }, { - "bom-ref": "96e4fffe-1749-4322-b54f-8068053bdd81", + "bom-ref": "aeee1411-648e-480d-95c3-7406914ae870", "type": "cryptographic-asset", "name": "certificate:140:140:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -5253,7 +5253,7 @@ } }, { - "bom-ref": "63d6daa7-f2e6-49b9-8e4c-fd4d8480dd6c", + "bom-ref": "e57f5917-0f9c-4abf-94ad-1e0e0203abe3", "type": "cryptographic-asset", "name": "certificate:140:140:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -5284,7 +5284,7 @@ } }, { - "bom-ref": "ee2063b5-e3b1-4cd6-a6b2-9273b214eac6", + "bom-ref": "c03e9a57-9f2d-40c3-a1f2-dc519e36202b", "type": "cryptographic-asset", "name": "certificate:140:140:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -5303,7 +5303,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/microshift/pkg/util/cert.go", + "location": "pkg/util/cert.go", "line": 140, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -5315,7 +5315,7 @@ } }, { - "bom-ref": "ae28f8ea-e144-421f-99a8-0b0687263676", + "bom-ref": "09814871-d300-4d44-8396-0e3d219fd790", "type": "cryptographic-asset", "name": "certificate:140:140:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -5334,7 +5334,7 @@ ], "occurrences": [ { - "location": "pkg/util/cert.go", + "location": "etcd-deps/github.com/openshift/microshift/pkg/util/cert.go", "line": 140, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -5346,7 +5346,7 @@ } }, { - "bom-ref": "fe096b35-ce2e-4e33-a6a8-9a57129495d6", + "bom-ref": "be0e7626-6009-4c07-92a3-75f0ec90733a", "type": "cryptographic-asset", "name": "certificate:143:143:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -5365,7 +5365,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", + "location": "vendor-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", "line": 143, "additionalContext": "scanoss:match,crt, err := tls.X509KeyPair(cert, key)" } @@ -5377,7 +5377,7 @@ } }, { - "bom-ref": "12f2c368-bdf3-4b77-8065-adefc2814926", + "bom-ref": "f2551a35-ec72-4adc-8427-e26048a4cedd", "type": "cryptographic-asset", "name": "certificate:143:143:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -5396,7 +5396,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", + "location": "etcd-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", "line": 143, "additionalContext": "scanoss:match,crt, err := tls.X509KeyPair(cert, key)" } @@ -5408,7 +5408,7 @@ } }, { - "bom-ref": "124b7fcb-b41c-4b32-9a56-7feb93ec4441", + "bom-ref": "8569954a-6ff0-4c8b-aa8f-59b42411a10a", "type": "cryptographic-asset", "name": "certificate:157:157::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5441,7 +5441,7 @@ } }, { - "bom-ref": "52a2664c-2945-4f6c-93e9-19b472612c02", + "bom-ref": "88f4db5f-3a12-4c95-84f4-0d92f1a6dd2e", "type": "cryptographic-asset", "name": "certificate:157:157::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5474,7 +5474,7 @@ } }, { - "bom-ref": "7d12bd6c-692d-4473-bc9d-ad5fdd17d56e", + "bom-ref": "cbd09400-2bc4-43b8-a262-74303adda70b", "type": "cryptographic-asset", "name": "certificate:158:158::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5507,7 +5507,7 @@ } }, { - "bom-ref": "4b2bb1d4-2189-4b8b-b5b7-c6cba3c03cff", + "bom-ref": "67a389ed-0aae-4840-8fe8-8e4a9bd78526", "type": "cryptographic-asset", "name": "certificate:158:158::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5540,7 +5540,7 @@ } }, { - "bom-ref": "b7945834-dc06-4321-9a4a-16690d204dbc", + "bom-ref": "aac7d08f-42a4-44b4-991f-afd4069a881b", "type": "cryptographic-asset", "name": "certificate:159:159::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5573,7 +5573,7 @@ } }, { - "bom-ref": "2efd7df9-6d1f-4b0b-985e-12aba4833aa6", + "bom-ref": "58559050-ac62-44a1-b1ed-0fcebe30397c", "type": "cryptographic-asset", "name": "certificate:159:159::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5606,7 +5606,7 @@ } }, { - "bom-ref": "ea7439a9-9a18-4e67-9c5a-4a649f539c28", + "bom-ref": "fdb0bff3-7066-4382-91da-13e521e4785a", "type": "cryptographic-asset", "name": "certificate:159:159:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -5637,7 +5637,7 @@ } }, { - "bom-ref": "2ac0eb83-da55-4e15-a2df-e5df04b80c8a", + "bom-ref": "7b55f907-abca-4ac4-a98b-aeb59d038ae0", "type": "cryptographic-asset", "name": "certificate:161:161:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -5668,7 +5668,7 @@ } }, { - "bom-ref": "889392cf-e82f-4d39-82c9-2eed9091d9b9", + "bom-ref": "056ff092-da89-4cfc-b20b-739db0202d30", "type": "cryptographic-asset", "name": "certificate:162:165::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5687,7 +5687,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 162, "additionalContext": "scanoss:match,return \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{cert}, ca.Config.Certs...), Key: privateKey, }, nil" } @@ -5701,7 +5701,7 @@ } }, { - "bom-ref": "0ce9cdcd-c513-45ca-a4e6-1525a27dc2b0", + "bom-ref": "be0a4ba4-fd34-46de-ba16-e519e62c7fa5", "type": "cryptographic-asset", "name": "certificate:162:165::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -5720,7 +5720,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 162, "additionalContext": "scanoss:match,return \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{cert}, ca.Config.Certs...), Key: privateKey, }, nil" } @@ -5734,7 +5734,7 @@ } }, { - "bom-ref": "da5942be-a7a0-4095-9474-76657995f04c", + "bom-ref": "ce11ef88-3468-477c-b389-0aaf7511a505", "type": "cryptographic-asset", "name": "certificate:175:175:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -5765,7 +5765,7 @@ } }, { - "bom-ref": "472441f3-cc45-4761-be47-5fe170c0c702", + "bom-ref": "74331835-dc90-4026-b5df-67f23bbca805", "type": "cryptographic-asset", "name": "certificate:186:186:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -5796,7 +5796,7 @@ } }, { - "bom-ref": "462e5cc4-0001-4f1e-a41b-3d6745f76daa", + "bom-ref": "03996460-81db-4ea3-b5ea-2e99daa57bf4", "type": "cryptographic-asset", "name": "certificate:18:18:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -5815,7 +5815,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/tls.go", + "location": "vendor-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/tls.go", "line": 18, "additionalContext": "scanoss:match,cp := x509.NewCertPool()" } @@ -5827,7 +5827,7 @@ } }, { - "bom-ref": "03dabdf6-f20d-43fe-a8ba-3873fc8a1b82", + "bom-ref": "5a0eee8c-40cd-4d23-a7b7-47c950d0fa0e", "type": "cryptographic-asset", "name": "certificate:18:18:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -5846,7 +5846,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/tls.go", + "location": "etcd-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/tls.go", "line": 18, "additionalContext": "scanoss:match,cp := x509.NewCertPool()" } @@ -5858,7 +5858,7 @@ } }, { - "bom-ref": "90e10943-187b-4c7d-ad09-7976420c877b", + "bom-ref": "ba6555b8-1062-43a0-b827-332306532315", "type": "cryptographic-asset", "name": "certificate:192:192:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -5889,7 +5889,7 @@ } }, { - "bom-ref": "40001424-74ad-4fa0-84ad-17268cf4b93a", + "bom-ref": "c4444314-78c1-474c-945c-f54208f30f4c", "type": "cryptographic-asset", "name": "certificate:193:193:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -5920,7 +5920,7 @@ } }, { - "bom-ref": "2633c9e7-16c9-4ef8-bd21-76f78a2f3f84", + "bom-ref": "ed5e114c-edaf-4798-b776-9ce157047bc9", "type": "cryptographic-asset", "name": "certificate:193:193:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -5939,7 +5939,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", + "location": "etcd-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", "line": 193, "additionalContext": "scanoss:match,cp := x509.NewCertPool()" } @@ -5951,7 +5951,7 @@ } }, { - "bom-ref": "20c483f6-2578-4f0c-a434-30804ba1a0f8", + "bom-ref": "acdb6f37-2ab0-441f-93da-eb12d71fe787", "type": "cryptographic-asset", "name": "certificate:193:193:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -5970,7 +5970,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", + "location": "vendor-deps/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go", "line": 193, "additionalContext": "scanoss:match,cp := x509.NewCertPool()" } @@ -5982,7 +5982,7 @@ } }, { - "bom-ref": "110adbff-c549-4e89-98d0-3fc5dfd363b2", + "bom-ref": "e58e858c-b158-4da6-abbe-2e676befe66e", "type": "cryptographic-asset", "name": "certificate:194:194:algorithmPrimitive=other:api=Certificate.Verify:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -6013,7 +6013,7 @@ } }, { - "bom-ref": "566c8e13-b87c-44cb-9a10-29b96f2b7005", + "bom-ref": "59f709f9-da2a-40e7-8ce5-df32eca749f8", "type": "cryptographic-asset", "name": "certificate:196:196:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6044,7 +6044,7 @@ } }, { - "bom-ref": "13040a38-448a-4ef9-a9ae-a6e4ebda9b3f", + "bom-ref": "b48c5fe7-d543-4bf5-8fa4-9f8bd4d124a2", "type": "cryptographic-asset", "name": "certificate:196:196:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6075,7 +6075,7 @@ } }, { - "bom-ref": "8b304009-3158-4e19-8c6f-1ac7da37e9f6", + "bom-ref": "fed4b3ca-6260-4ada-b5c5-86c6fada0184", "type": "cryptographic-asset", "name": "certificate:196:196:algorithmPrimitive=other:api=x509.ParseCertificates:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6106,7 +6106,7 @@ } }, { - "bom-ref": "dc4b5352-a343-4faa-918c-045db5c109ad", + "bom-ref": "3e7d9f27-f7cf-4d1c-a3a6-8183855c002f", "type": "cryptographic-asset", "name": "certificate:198:198:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6137,7 +6137,7 @@ } }, { - "bom-ref": "889c46f8-dc75-4f6b-a6ca-2a25a0615b99", + "bom-ref": "913f079c-7d2b-43d8-aa8d-c443c20dbef2", "type": "cryptographic-asset", "name": "certificate:198:198:algorithmPrimitive=other:api=x509.ParseRevocationList:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6156,7 +6156,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go", + "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go", "line": 198, "additionalContext": "scanoss:match,certList, err := x509.ParseRevocationList(crlBytes)" } @@ -6168,7 +6168,7 @@ } }, { - "bom-ref": "456bf4b6-5e11-4cb2-b268-35af36eb62bf", + "bom-ref": "7b926cce-52dd-4952-8aa5-937333f778a3", "type": "cryptographic-asset", "name": "certificate:198:198:algorithmPrimitive=other:api=x509.ParseRevocationList:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6187,7 +6187,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go", + "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go", "line": 198, "additionalContext": "scanoss:match,certList, err := x509.ParseRevocationList(crlBytes)" } @@ -6199,7 +6199,7 @@ } }, { - "bom-ref": "45e0e735-270b-4d0d-97f8-102600ce94e3", + "bom-ref": "abb594ea-50a3-41f9-bd42-a9111e1627cd", "type": "cryptographic-asset", "name": "certificate:201:201:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6218,7 +6218,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", + "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", "line": 201, "additionalContext": "scanoss:match,caCertificate, err := x509.ParseCertificate(caDERBytes)" } @@ -6230,7 +6230,7 @@ } }, { - "bom-ref": "6985b39e-7a3d-48c6-a045-b7c33edbfa7f", + "bom-ref": "93e5b0f3-48a2-47d9-9e3e-af7300977f4e", "type": "cryptographic-asset", "name": "certificate:201:201:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6249,7 +6249,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", + "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", "line": 201, "additionalContext": "scanoss:match,caCertificate, err := x509.ParseCertificate(caDERBytes)" } @@ -6261,7 +6261,7 @@ } }, { - "bom-ref": "1d875ea5-c8dd-4108-95f7-ff23b68289f6", + "bom-ref": "fa9942d1-5aea-45ad-8f44-8a96c0140616", "type": "cryptographic-asset", "name": "certificate:202:202:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6292,7 +6292,7 @@ } }, { - "bom-ref": "7467a4d3-9cab-4ba9-919d-35f82c45f656", + "bom-ref": "53ee215f-02cd-462b-949b-807c4144783b", "type": "cryptographic-asset", "name": "certificate:204:204:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6323,7 +6323,7 @@ } }, { - "bom-ref": "ffb62589-f80b-427e-b06a-19bbfa5866cf", + "bom-ref": "22440fe5-5b29-4ff8-8d5e-55c4d4364b1a", "type": "cryptographic-asset", "name": "certificate:208:208:algorithmPrimitive=other:api=Certificate.Verify:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -6354,7 +6354,7 @@ } }, { - "bom-ref": "de8d6ee8-935d-4753-b461-db6da8aa5b20", + "bom-ref": "13522bf8-0471-4bc7-a98f-1af6ae792846", "type": "cryptographic-asset", "name": "certificate:216:216::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6373,7 +6373,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 216, "additionalContext": "scanoss:match,cert, err := ca.SignCertificate(template, publicKey)" } @@ -6387,7 +6387,7 @@ } }, { - "bom-ref": "ee9aa1ef-e66b-47a7-8fbd-2346eaffd914", + "bom-ref": "1cca8ed4-2947-408f-b721-364e8c9fb36d", "type": "cryptographic-asset", "name": "certificate:216:216::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6406,7 +6406,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 216, "additionalContext": "scanoss:match,cert, err := ca.SignCertificate(template, publicKey)" } @@ -6420,7 +6420,7 @@ } }, { - "bom-ref": "58330671-45d6-4605-93bd-2f6f16f477e7", + "bom-ref": "816b054f-b0fc-433f-8299-20f2dd05ccaa", "type": "cryptographic-asset", "name": "certificate:217:217::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6453,7 +6453,7 @@ } }, { - "bom-ref": "26a01805-fdb4-4811-babf-680ea2451f68", + "bom-ref": "5b8415b1-d54a-4f17-8422-4bba69acd135", "type": "cryptographic-asset", "name": "certificate:217:217::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6486,7 +6486,7 @@ } }, { - "bom-ref": "0e059ded-c474-41d9-a8ee-d24e23e9bd78", + "bom-ref": "04c1e012-11e6-469f-a9da-c8504faadb49", "type": "cryptographic-asset", "name": "certificate:218:218::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6505,7 +6505,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 218, "additionalContext": "scanoss:match,return nil, fmt.Errorf(\"failed to sign certificate: %w\", err)" } @@ -6519,7 +6519,7 @@ } }, { - "bom-ref": "5e821db0-181c-4e0d-b76b-894cfb7a2fdf", + "bom-ref": "2e35d6cf-4e28-4843-aa54-3fccce45af63", "type": "cryptographic-asset", "name": "certificate:218:218::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6538,7 +6538,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 218, "additionalContext": "scanoss:match,return nil, fmt.Errorf(\"failed to sign certificate: %w\", err)" } @@ -6552,7 +6552,7 @@ } }, { - "bom-ref": "9c930c5d-3d07-4da7-838c-847b47dbe998", + "bom-ref": "52fac539-efa5-4a13-ba83-dae0e6754f1c", "type": "cryptographic-asset", "name": "certificate:221:224::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6585,7 +6585,7 @@ } }, { - "bom-ref": "d89e8b9a-5b60-4bbd-a9b7-bf5853be2967", + "bom-ref": "efc0f92d-65d3-431b-8c88-e318aab1af30", "type": "cryptographic-asset", "name": "certificate:221:224::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -6618,7 +6618,7 @@ } }, { - "bom-ref": "63563342-77d2-4b29-a714-0fdf0d375643", + "bom-ref": "57892f24-dc90-4daf-a72c-ad6610962fc8", "type": "cryptographic-asset", "name": "certificate:234:234:algorithmPrimitive=other:api=x509.ParseCertificates:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6649,7 +6649,7 @@ } }, { - "bom-ref": "4fc60a10-7e5d-4ec6-b8b5-7c009ce8506a", + "bom-ref": "edc32c21-a414-4108-a6af-358eecb1a04a", "type": "cryptographic-asset", "name": "certificate:238:238:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6668,7 +6668,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", + "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", "line": 238, "additionalContext": "scanoss:match,derBytes, err := x509.CreateCertificate(cryptorand.Reader, \u0026template, caCertificate, \u0026priv.PublicKey, caKey)" } @@ -6680,7 +6680,7 @@ } }, { - "bom-ref": "acfe391a-7943-4ddf-997d-4b5634aa00b0", + "bom-ref": "390eae1f-304a-4f7a-8082-33ac21f14937", "type": "cryptographic-asset", "name": "certificate:238:238:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6699,7 +6699,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", + "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", "line": 238, "additionalContext": "scanoss:match,derBytes, err := x509.CreateCertificate(cryptorand.Reader, \u0026template, caCertificate, \u0026priv.PublicKey, caKey)" } @@ -6711,7 +6711,7 @@ } }, { - "bom-ref": "ffd793c0-3cb5-4131-a943-f0b884510116", + "bom-ref": "f6320dc2-f4a8-4629-adbf-1af17c67471a", "type": "cryptographic-asset", "name": "certificate:241:241:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6742,7 +6742,7 @@ } }, { - "bom-ref": "aecc64a9-eb20-4a7b-884b-e493ed7d3155", + "bom-ref": "af6ccba6-7a99-4fa0-ba3a-ef41d1b3849e", "type": "cryptographic-asset", "name": "certificate:241:241:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6773,7 +6773,7 @@ } }, { - "bom-ref": "a138e72a-0285-497a-8724-cb29930b3afd", + "bom-ref": "eb48dc53-ea66-4421-be72-bd480d0f65e1", "type": "cryptographic-asset", "name": "certificate:251:251:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6804,7 +6804,7 @@ } }, { - "bom-ref": "ff65c27f-398f-4263-af70-5a21b296dac5", + "bom-ref": "f9e5da9b-74a0-421f-9fb3-80b116d8a76a", "type": "cryptographic-asset", "name": "certificate:253:253:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -6835,7 +6835,7 @@ } }, { - "bom-ref": "7e1d83ad-ef3f-4cda-bf96-cf6703de9280", + "bom-ref": "4b53da5b-8cfa-4537-91e0-f8b383707ae7", "type": "cryptographic-asset", "name": "certificate:257:257:algorithmPrimitive=other:api=Certificate.Verify:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -6866,7 +6866,7 @@ } }, { - "bom-ref": "d9a12a61-03b9-4b25-9e6a-ca50a9df351d", + "bom-ref": "521cd35b-8347-4d1f-a1c3-deb4f49ad21d", "type": "cryptographic-asset", "name": "certificate:261:261:algorithmPrimitive=other:api=x509.VerifyOptions:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:operation=verify", "evidence": { @@ -6897,7 +6897,7 @@ } }, { - "bom-ref": "271e6e3c-3c57-4fdf-a951-60deb42f9b99", + "bom-ref": "8dc0a5b1-8c8c-4dc6-b6df-43879702b67c", "type": "cryptographic-asset", "name": "certificate:26:26:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6916,7 +6916,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", + "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", "line": 26, "additionalContext": "scanoss:match,certPool := x509.NewCertPool()" } @@ -6928,7 +6928,7 @@ } }, { - "bom-ref": "4ca461a6-b3ef-4e33-9497-a67178fcce97", + "bom-ref": "4a541824-454e-4418-abac-4846c9af2280", "type": "cryptographic-asset", "name": "certificate:26:26:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6947,7 +6947,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", + "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", "line": 26, "additionalContext": "scanoss:match,certPool := x509.NewCertPool()" } @@ -6959,7 +6959,7 @@ } }, { - "bom-ref": "fb175143-53a1-46b4-8430-1f7a2cfbeddd", + "bom-ref": "8854caf1-ce82-406e-bcb7-5aed1a557dda", "type": "cryptographic-asset", "name": "certificate:272:272:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -6978,7 +6978,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/transport/transport.go", + "location": "etcd-deps/k8s.io/client-go/transport/transport.go", "line": 272, "additionalContext": "scanoss:match,return x509.NewCertPool(), nil" } @@ -6990,7 +6990,7 @@ } }, { - "bom-ref": "d7003dcf-bbfc-4e37-945d-e0df819a5b07", + "bom-ref": "b24c8648-2274-4514-9845-f22056a0aa1b", "type": "cryptographic-asset", "name": "certificate:272:272:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -7009,7 +7009,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/transport/transport.go", + "location": "vendor-deps/k8s.io/client-go/transport/transport.go", "line": 272, "additionalContext": "scanoss:match,return x509.NewCertPool(), nil" } @@ -7021,7 +7021,7 @@ } }, { - "bom-ref": "5a0ac5d3-4f9a-42f8-a7e1-b43acace32f8", + "bom-ref": "0101fe21-cae6-438d-83eb-3f23ce44d978", "type": "cryptographic-asset", "name": "certificate:273:273:algorithmPrimitive=other:api=x509.VerifyOptions:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:operation=verify", "evidence": { @@ -7052,7 +7052,7 @@ } }, { - "bom-ref": "a981e371-1660-4d48-9910-6de9750f718a", + "bom-ref": "18c59553-f64b-4a41-b87f-f36960df94e7", "type": "cryptographic-asset", "name": "certificate:276:276:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -7083,7 +7083,7 @@ } }, { - "bom-ref": "ee92606e-ad56-4374-8bf4-783910ad3f1b", + "bom-ref": "2c707542-11ed-4848-8874-e2eb54439400", "type": "cryptographic-asset", "name": "certificate:276:282::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateFileExtension=pem:certificateIsCA=true:certificateIssuerName=fmt.Sprintf(\"%s-signer@%d\"c.componentName time.Now().Unix()):certificateKeyUsage=[keyCertSign digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=fmt.Sprintf(\"%s-signer@%d\"c.componentName time.Now().Unix()):library=openshift/library-go", "evidence": { @@ -7116,7 +7116,7 @@ } }, { - "bom-ref": "40cf9972-52e2-4593-8869-3342f13c4526", + "bom-ref": "88d6467e-2056-4320-88a9-be8d6200b1de", "type": "cryptographic-asset", "name": "certificate:276:282::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7149,7 +7149,7 @@ } }, { - "bom-ref": "171daeb7-68d2-4649-bc01-151ba94974db", + "bom-ref": "36347a59-51d6-46fc-8158-87b00285c1e8", "type": "cryptographic-asset", "name": "certificate:278:278:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -7180,7 +7180,7 @@ } }, { - "bom-ref": "67018689-cdb4-43cc-bb51-d294bd7cee5a", + "bom-ref": "f03eea10-66c4-4191-bfaa-a12a305f30e4", "type": "cryptographic-asset", "name": "certificate:278:278:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -7211,7 +7211,7 @@ } }, { - "bom-ref": "d711510b-588a-4c4a-b812-2d6f309ff84b", + "bom-ref": "54976284-d1a7-4d88-9a5c-2f983cae8906", "type": "cryptographic-asset", "name": "certificate:282:282:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -7242,7 +7242,7 @@ } }, { - "bom-ref": "32385115-b712-42ac-baff-d95a253149d6", + "bom-ref": "497ec2ea-2f19-43e2-abb1-a0249110228f", "type": "cryptographic-asset", "name": "certificate:283:283::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7275,7 +7275,7 @@ } }, { - "bom-ref": "2693587d-918c-412c-9246-b1de08db9510", + "bom-ref": "434e8858-2d80-4cac-a2da-62473e8b80ea", "type": "cryptographic-asset", "name": "certificate:283:285:algorithmPrimitive=other:api=x509.VerifyOptions:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:operation=verify", "evidence": { @@ -7306,7 +7306,7 @@ } }, { - "bom-ref": "17b18519-dbf3-4689-9888-f495f983f4c7", + "bom-ref": "f5598c5e-a033-4e86-9ab0-5d8a32df5f20", "type": "cryptographic-asset", "name": "certificate:284:284::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7339,7 +7339,7 @@ } }, { - "bom-ref": "cc248956-71eb-4efd-ab22-84615c47e1ec", + "bom-ref": "e5b19ac9-d01e-4143-91b7-442ec3d47751", "type": "cryptographic-asset", "name": "certificate:286:286:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -7370,7 +7370,7 @@ } }, { - "bom-ref": "bc52ee85-2d6c-459f-9293-ea1f20c4f84a", + "bom-ref": "dab09654-495d-4275-afb5-31c5cec479fd", "type": "cryptographic-asset", "name": "certificate:287:287:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -7401,7 +7401,7 @@ } }, { - "bom-ref": "ad09ca99-3b30-4b05-ba4f-55edfa3b0e10", + "bom-ref": "020affcc-2224-4c2e-a319-b9201e0f8b59", "type": "cryptographic-asset", "name": "certificate:287:287:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -7420,7 +7420,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/keyutil/key.go", + "location": "vendor-deps/k8s.io/client-go/util/keyutil/key.go", "line": 287, "additionalContext": "scanoss:match,if cert, err := x509.ParseCertificate(data); err == nil {" } @@ -7432,7 +7432,7 @@ } }, { - "bom-ref": "b32a9f3e-05b7-4755-afc2-4ed7e67964cb", + "bom-ref": "73b94257-3c29-4392-8f78-b07ff28d219c", "type": "cryptographic-asset", "name": "certificate:287:287:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -7463,7 +7463,7 @@ } }, { - "bom-ref": "39d59085-b3bd-4c67-a0c5-2f1e0e638694", + "bom-ref": "4f60d788-fb49-4946-940e-52dd740acf61", "type": "cryptographic-asset", "name": "certificate:287:287:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -7482,7 +7482,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/keyutil/key.go", + "location": "etcd-deps/k8s.io/client-go/util/keyutil/key.go", "line": 287, "additionalContext": "scanoss:match,if cert, err := x509.ParseCertificate(data); err == nil {" } @@ -7494,7 +7494,7 @@ } }, { - "bom-ref": "022ec9ad-31e2-477f-bfed-5351971ab522", + "bom-ref": "e5a7a600-f774-4fe1-83dc-d2d89445cd3c", "type": "cryptographic-asset", "name": "certificate:288:288:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -7513,7 +7513,7 @@ ], "occurrences": [ { - "location": "etcd-deps/google.golang.org/grpc/credentials/tls.go", + "location": "vendor-deps/google.golang.org/grpc/credentials/tls.go", "line": 288, "additionalContext": "scanoss:match,cp := x509.NewCertPool()" } @@ -7525,7 +7525,7 @@ } }, { - "bom-ref": "e0ac198b-76ac-4913-b171-247b4c43a6a5", + "bom-ref": "a0213452-2823-4a4f-bd66-e55be819fda1", "type": "cryptographic-asset", "name": "certificate:288:288:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -7544,7 +7544,7 @@ ], "occurrences": [ { - "location": "vendor-deps/google.golang.org/grpc/credentials/tls.go", + "location": "etcd-deps/google.golang.org/grpc/credentials/tls.go", "line": 288, "additionalContext": "scanoss:match,cp := x509.NewCertPool()" } @@ -7556,7 +7556,7 @@ } }, { - "bom-ref": "d5c4f1cd-6039-4814-82a9-9f9060bf40f2", + "bom-ref": "55ec9ac5-627f-4baf-94d6-0cbe230a7c69", "type": "cryptographic-asset", "name": "certificate:289:289:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -7587,7 +7587,7 @@ } }, { - "bom-ref": "1819315d-0e11-4ddd-bf6b-903faa2eac6b", + "bom-ref": "ef27b495-afc5-48c4-bcff-96cb8264d459", "type": "cryptographic-asset", "name": "certificate:291:291::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7620,7 +7620,7 @@ } }, { - "bom-ref": "aef54d42-0a33-46e3-80e6-8c87ae278e0c", + "bom-ref": "10550e00-a3b4-4492-bcc7-0475fe8b96f0", "type": "cryptographic-asset", "name": "certificate:291:291::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateFileExtension=pem:certificateIsCA=false:certificateKeyUsage=[digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time_minus_1s:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSANs=sets.New(\"localhost\"):certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=server_hostname:library=openshift/library-go", "evidence": { @@ -7653,7 +7653,7 @@ } }, { - "bom-ref": "3f107a31-7ced-4092-b61b-339babe84b11", + "bom-ref": "1578a9bd-e416-4802-8904-9feac78c0693", "type": "cryptographic-asset", "name": "certificate:291:291::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7686,7 +7686,7 @@ } }, { - "bom-ref": "034b0f52-b692-444f-8685-b18707b197fd", + "bom-ref": "1f8473b0-3108-425c-b37b-944e7a3bf2a4", "type": "cryptographic-asset", "name": "certificate:291:293:algorithmPrimitive=other:api=x509.VerifyOptions:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:operation=verify", "evidence": { @@ -7717,7 +7717,7 @@ } }, { - "bom-ref": "408aaecb-98b5-4a4f-b34d-87c18fad1cf8", + "bom-ref": "7182c68b-111a-4b71-912d-fc5695ffe85b", "type": "cryptographic-asset", "name": "certificate:292:292::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7750,7 +7750,7 @@ } }, { - "bom-ref": "835aecd4-3afa-4bbf-8db2-602d51e92f7c", + "bom-ref": "16de5663-5152-4980-9114-560a3535c15a", "type": "cryptographic-asset", "name": "certificate:292:292::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7783,7 +7783,7 @@ } }, { - "bom-ref": "6f4e8082-4094-42be-9e4b-0154aaf089b7", + "bom-ref": "8f782731-55cd-4c2f-acfa-f27bdf197f05", "type": "cryptographic-asset", "name": "certificate:293:293::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7816,7 +7816,7 @@ } }, { - "bom-ref": "7121ab1f-e528-49b1-8b5a-13b43a55bcc7", + "bom-ref": "e9c305a5-0df0-48eb-b2a2-56c9e55b8094", "type": "cryptographic-asset", "name": "certificate:293:293::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7849,7 +7849,7 @@ } }, { - "bom-ref": "9f20d8a4-5e1f-4c37-a651-0c7f162e63ad", + "bom-ref": "3ccb0a9c-d9a4-4720-8b4a-a468df144099", "type": "cryptographic-asset", "name": "certificate:295:295::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7882,7 +7882,7 @@ } }, { - "bom-ref": "7cef4003-2348-41cf-93a8-3553e485662d", + "bom-ref": "91eaaa92-d3f7-472a-b895-8faecda00b06", "type": "cryptographic-asset", "name": "certificate:295:295::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7915,7 +7915,7 @@ } }, { - "bom-ref": "488fe7fd-14ca-43c1-ab6e-0b39d4bc6575", + "bom-ref": "552fd57e-0740-469b-90c6-cb7605efe348", "type": "cryptographic-asset", "name": "certificate:296:296::X.509:algorithmPrimitive=other:api=crypto.MakeSelfSignedCA:certificateIsCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7948,7 +7948,7 @@ } }, { - "bom-ref": "8d7f890b-970c-49fb-9925-3c6028fe04d0", + "bom-ref": "22395243-38eb-43e2-80b0-0fede15f8a0b", "type": "cryptographic-asset", "name": "certificate:296:296::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -7981,7 +7981,7 @@ } }, { - "bom-ref": "78c6974c-86e4-42ee-b0f1-fa5ffe2df788", + "bom-ref": "b1f18633-cf9d-4035-901c-5f5c930a7307", "type": "cryptographic-asset", "name": "certificate:299:299:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8012,7 +8012,7 @@ } }, { - "bom-ref": "e787581d-1e55-49be-917a-12d45b8bf458", + "bom-ref": "3d8942a1-5348-4513-8845-b4cabe09a358", "type": "cryptographic-asset", "name": "certificate:299:299:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8043,7 +8043,7 @@ } }, { - "bom-ref": "a3a5f6e9-2028-45ca-9d02-93ae62f9a461", + "bom-ref": "5e194cdf-aeed-4db1-a9af-1dcaaa08a2b2", "type": "cryptographic-asset", "name": "certificate:303:303:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8074,7 +8074,7 @@ } }, { - "bom-ref": "4355a03d-915b-47cf-a312-54976ecee93d", + "bom-ref": "5e380604-c6ca-455d-8764-7a0f3bcc2ce7", "type": "cryptographic-asset", "name": "certificate:303:303:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8105,7 +8105,7 @@ } }, { - "bom-ref": "165e8954-ad3b-4f46-bbac-a597756f6053", + "bom-ref": "d5a72c1b-4de6-4bf4-a0fa-9bb4c8ad0800", "type": "cryptographic-asset", "name": "certificate:306:306:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -8136,7 +8136,7 @@ } }, { - "bom-ref": "4cb9f3ee-1de8-422e-b3a7-ff5cf52b162a", + "bom-ref": "388d0945-818d-4a2e-b005-768e4f367c85", "type": "cryptographic-asset", "name": "certificate:306:306:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -8167,7 +8167,7 @@ } }, { - "bom-ref": "b0a06552-180e-4177-94a1-e2553a34b5d7", + "bom-ref": "7999f624-8f29-44ad-914f-bca33ca38f38", "type": "cryptographic-asset", "name": "certificate:320:320:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8198,7 +8198,7 @@ } }, { - "bom-ref": "f25c7b66-97b8-438f-9eda-bfe2499c5806", + "bom-ref": "5a5be109-67f2-4925-a73e-fb739e301e16", "type": "cryptographic-asset", "name": "certificate:324:324:algorithmPrimitive=other:api=x509.ParseCertificates:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8229,7 +8229,7 @@ } }, { - "bom-ref": "6ec04547-ea52-4565-b201-8aa28809f84e", + "bom-ref": "3c816582-4401-4bee-a641-9fdae7d0dafa", "type": "cryptographic-asset", "name": "certificate:325:325:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8260,7 +8260,7 @@ } }, { - "bom-ref": "fb3281ec-6101-4ff9-bed8-75c3d4fa676b", + "bom-ref": "b984e090-818d-4b61-afdd-324765b7d3a3", "type": "cryptographic-asset", "name": "certificate:32:32:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8279,7 +8279,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/kubernetes/pkg/apis/certificates/v1/helpers.go", + "location": "vendor-deps/k8s.io/kubernetes/pkg/apis/certificates/v1beta1/helpers.go", "line": 32, "additionalContext": "scanoss:match,csr, err := x509.ParseCertificateRequest(block.Bytes)" } @@ -8291,7 +8291,7 @@ } }, { - "bom-ref": "51f7d83a-6cef-4a9f-aa82-222846c6c9f9", + "bom-ref": "d961e100-5c4d-4a48-a2f3-69050b5de27c", "type": "cryptographic-asset", "name": "certificate:32:32:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8310,7 +8310,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/kubernetes/pkg/apis/certificates/v1beta1/helpers.go", + "location": "vendor-deps/k8s.io/kubernetes/pkg/apis/certificates/v1/helpers.go", "line": 32, "additionalContext": "scanoss:match,csr, err := x509.ParseCertificateRequest(block.Bytes)" } @@ -8322,7 +8322,7 @@ } }, { - "bom-ref": "d7b7ad3c-82fc-4465-addf-f7d5c3999a55", + "bom-ref": "0eb83930-9bf2-4f3e-a850-f25c69c8ae34", "type": "cryptographic-asset", "name": "certificate:336:336:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -8353,7 +8353,7 @@ } }, { - "bom-ref": "6d7ad739-572a-47d7-9907-955627147295", + "bom-ref": "62c9ede6-395f-49b3-82ba-40d6db0b1b17", "type": "cryptographic-asset", "name": "certificate:33:33:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8384,7 +8384,7 @@ } }, { - "bom-ref": "23a6e212-30e5-43c3-b469-815d11f805c1", + "bom-ref": "14b0220a-3901-4917-9b63-2a5af5da7586", "type": "cryptographic-asset", "name": "certificate:342:342:algorithmPrimitive=other:api=Certificate.CheckSignature:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -8415,7 +8415,7 @@ } }, { - "bom-ref": "b5299747-1514-44b8-aaa1-5acd54b05173", + "bom-ref": "170372da-ca50-4285-88f8-11189d27ee10", "type": "cryptographic-asset", "name": "certificate:36:36:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8446,7 +8446,7 @@ } }, { - "bom-ref": "0281cdca-501a-4f5a-9583-3279968bb1f5", + "bom-ref": "f1c9a173-8e4e-4426-baff-19869fba153d", "type": "cryptographic-asset", "name": "certificate:378:378:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8477,7 +8477,7 @@ } }, { - "bom-ref": "415eade9-eed6-46b7-889d-7e96dce4d29b", + "bom-ref": "ecd4b3bd-2dec-45ab-b2f1-df62f219ad62", "type": "cryptographic-asset", "name": "certificate:389:389:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8508,7 +8508,7 @@ } }, { - "bom-ref": "525d5861-6080-49e3-9f58-4289189bc211", + "bom-ref": "53878aa4-1064-4bda-b8c0-73d420ec31ab", "type": "cryptographic-asset", "name": "certificate:389:389:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8539,7 +8539,7 @@ } }, { - "bom-ref": "422c0786-89eb-460e-a5b7-4d7477818c19", + "bom-ref": "4e81a653-2152-4920-9d93-126565180d52", "type": "cryptographic-asset", "name": "certificate:40:40:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8570,7 +8570,7 @@ } }, { - "bom-ref": "880869d9-4f34-4369-817b-e7f23af0832c", + "bom-ref": "7084b6eb-d337-4e0a-ae38-57bf7235a99e", "type": "cryptographic-asset", "name": "certificate:40:40:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8589,7 +8589,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", + "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", "line": 40, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -8601,7 +8601,7 @@ } }, { - "bom-ref": "1d7e0c30-f736-488f-863a-5bb72d005228", + "bom-ref": "205c437c-5e07-4c11-8100-c46459df196e", "type": "cryptographic-asset", "name": "certificate:40:40:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8620,7 +8620,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", + "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/tlsutil/tlsutil.go", "line": 40, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -8632,7 +8632,7 @@ } }, { - "bom-ref": "bc18a8c7-2b9a-4c2b-9903-90266043cca5", + "bom-ref": "37380f19-b6bc-4dae-92ff-f99f639944bc", "type": "cryptographic-asset", "name": "certificate:447:447:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8663,7 +8663,7 @@ } }, { - "bom-ref": "8252a0e7-4d60-4034-aaaf-7c7b3c31057f", + "bom-ref": "0debbb78-893d-4224-ba40-0bc2156fc263", "type": "cryptographic-asset", "name": "certificate:44:44:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8694,7 +8694,7 @@ } }, { - "bom-ref": "e35860dd-6386-4d5a-8d0b-f5f65607d55c", + "bom-ref": "b7987f6d-194b-41ca-8bf9-3783ddbbaf09", "type": "cryptographic-asset", "name": "certificate:45:45:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8725,7 +8725,7 @@ } }, { - "bom-ref": "c4a422f5-33f3-48a4-ac05-8c3cad7e132b", + "bom-ref": "c1aeef5c-a631-4552-9cec-b8d35a7bb3ce", "type": "cryptographic-asset", "name": "certificate:45:45:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8756,7 +8756,7 @@ } }, { - "bom-ref": "186f82bf-ab99-4805-b566-f1f99a269697", + "bom-ref": "ec5634bd-512d-4fdd-8640-d81b8792fd15", "type": "cryptographic-asset", "name": "certificate:46:46:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8787,7 +8787,7 @@ } }, { - "bom-ref": "16e749e5-411b-4959-b8be-abc467043eb6", + "bom-ref": "efd2cafb-fbe9-4c9c-9adb-da8827c4f8d9", "type": "cryptographic-asset", "name": "certificate:48:48:algorithmPrimitive=other:api=Certificate.CheckSignature:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -8818,7 +8818,7 @@ } }, { - "bom-ref": "8285fff8-83a6-4fc9-aa1e-366768e9af98", + "bom-ref": "f3bcaf4b-a49b-4d71-bf55-fe53bb16e926", "type": "cryptographic-asset", "name": "certificate:48:48:algorithmPrimitive=other:api=x509.Create:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8837,7 +8837,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/cert/csr.go", + "location": "etcd-deps/k8s.io/client-go/util/cert/csr.go", "line": 48, "additionalContext": "scanoss:match,csrDER, err := x509.CreateCertificateRequest(cryptorand.Reader, \u0026t, privateKey)" } @@ -8849,7 +8849,7 @@ } }, { - "bom-ref": "5b6519e1-5edb-4cc3-a430-70bd5060f78a", + "bom-ref": "970ff4c0-9f1f-4df2-a403-ef9f05e486fe", "type": "cryptographic-asset", "name": "certificate:48:48:algorithmPrimitive=other:api=x509.Create:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8868,7 +8868,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/cert/csr.go", + "location": "vendor-deps/k8s.io/client-go/util/cert/csr.go", "line": 48, "additionalContext": "scanoss:match,csrDER, err := x509.CreateCertificateRequest(cryptorand.Reader, \u0026t, privateKey)" } @@ -8880,7 +8880,7 @@ } }, { - "bom-ref": "7a51c0aa-8801-429f-b68d-5026f34434b0", + "bom-ref": "662baa70-4db2-483e-a911-9396328e732c", "type": "cryptographic-asset", "name": "certificate:49:49:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8899,7 +8899,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/cert/pem.go", + "location": "etcd-deps/k8s.io/client-go/util/cert/pem.go", "line": 49, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -8911,7 +8911,7 @@ } }, { - "bom-ref": "e075c52a-2408-4888-a629-bfed7cc17fbb", + "bom-ref": "9aea4836-1b98-4862-8562-f81634cfa3dd", "type": "cryptographic-asset", "name": "certificate:49:49:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -8930,7 +8930,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/cert/pem.go", + "location": "vendor-deps/k8s.io/client-go/util/cert/pem.go", "line": 49, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -8942,7 +8942,7 @@ } }, { - "bom-ref": "cb034a62-b810-4637-ad3e-63c6184f11ac", + "bom-ref": "38fa931d-0b19-4887-9a3b-5beb663827e9", "type": "cryptographic-asset", "name": "certificate:507:507:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -8973,7 +8973,7 @@ } }, { - "bom-ref": "b303a9f4-4eb1-4e37-90bc-8152e5dd436b", + "bom-ref": "339e0632-a5ab-4c65-8bad-9b33052319c0", "type": "cryptographic-asset", "name": "certificate:507:507:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -9004,7 +9004,7 @@ } }, { - "bom-ref": "3e61f3eb-19f3-41ed-b50f-dd5b35e9c037", + "bom-ref": "cafd42db-78e2-47e3-8022-d4bb07f41cce", "type": "cryptographic-asset", "name": "certificate:518:518:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -9035,7 +9035,7 @@ } }, { - "bom-ref": "77353b27-557d-43bd-a017-a3de1b601ab3", + "bom-ref": "5cb1e48c-1b29-417b-936b-eb907d76524d", "type": "cryptographic-asset", "name": "certificate:518:518:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -9066,7 +9066,7 @@ } }, { - "bom-ref": "384db399-c047-4c89-a1be-19837b27d0cb", + "bom-ref": "18789d99-aa8c-45fa-affb-2d34032656ca", "type": "cryptographic-asset", "name": "certificate:524:524:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -9085,7 +9085,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 524, "additionalContext": "scanoss:match,keyPairCert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)" } @@ -9097,7 +9097,7 @@ } }, { - "bom-ref": "6f8cf5bd-421c-4bcf-8fbb-839ec239fb33", + "bom-ref": "cad761f6-cac3-479a-92e3-5c014b72f46a", "type": "cryptographic-asset", "name": "certificate:524:524:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -9116,7 +9116,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 524, "additionalContext": "scanoss:match,keyPairCert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)" } @@ -9128,7 +9128,7 @@ } }, { - "bom-ref": "436820a6-ff7c-412f-8554-8caf92e51520", + "bom-ref": "3e5ab2fd-df67-426b-a320-35e9f49eb17b", "type": "cryptographic-asset", "name": "certificate:529:529:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -9159,7 +9159,7 @@ } }, { - "bom-ref": "465229e8-3797-455a-98fc-5c1899d38b1c", + "bom-ref": "a4756895-34a1-49a4-8107-2ff9eda18d0a", "type": "cryptographic-asset", "name": "certificate:534:534::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9192,7 +9192,7 @@ } }, { - "bom-ref": "2ab5823c-dff6-4c25-b3ac-9a12f20d7a4c", + "bom-ref": "d69d7f10-cb3c-4ffd-89d3-20fce6f79bce", "type": "cryptographic-asset", "name": "certificate:534:534::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9225,7 +9225,7 @@ } }, { - "bom-ref": "1ff46c66-c684-4fe1-b9dc-cb2a1d732a74", + "bom-ref": "9d1671d7-bb1f-4ceb-9b6a-d946ef7224ab", "type": "cryptographic-asset", "name": "certificate:537:537:algorithmPrimitive=other:api=x509.ParseCertificates:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -9256,7 +9256,7 @@ } }, { - "bom-ref": "3823ac9f-7629-4fb2-915f-fca4d028c665", + "bom-ref": "4a18256f-2f9b-4048-94b8-674eece8d067", "type": "cryptographic-asset", "name": "certificate:53:53::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9275,7 +9275,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 53, "additionalContext": "scanoss:match,cert, err := o.signer.SignCertificate(template, publicKey)" } @@ -9289,7 +9289,7 @@ } }, { - "bom-ref": "2f12a146-0e11-4014-8520-da6ca2edf9c7", + "bom-ref": "c41b16ba-3107-4bb4-a0ac-158ad591ac9f", "type": "cryptographic-asset", "name": "certificate:53:53::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9308,7 +9308,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 53, "additionalContext": "scanoss:match,cert, err := o.signer.SignCertificate(template, publicKey)" } @@ -9322,7 +9322,7 @@ } }, { - "bom-ref": "cd036e2e-2a02-4da0-883a-f916ac2f10a1", + "bom-ref": "7e6cb7cc-a255-41cc-a863-5d59aeb311e9", "type": "cryptographic-asset", "name": "certificate:541:541::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9355,7 +9355,7 @@ } }, { - "bom-ref": "35befff3-822f-43c3-8665-137e5c2b75a9", + "bom-ref": "9cfa6c69-b750-4d52-b2ca-976ec4c60600", "type": "cryptographic-asset", "name": "certificate:541:541::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9388,7 +9388,7 @@ } }, { - "bom-ref": "c5834ce6-cb3d-47a7-97bd-067c3596b4cb", + "bom-ref": "0dd94c71-68dd-4352-b6ed-84748ed3acc1", "type": "cryptographic-asset", "name": "certificate:542:542::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9407,7 +9407,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 542, "additionalContext": "scanoss:match,if err != nil {" } @@ -9421,7 +9421,7 @@ } }, { - "bom-ref": "00ed4627-ac13-4cd9-a1a3-22b556a5241a", + "bom-ref": "ac2ed93e-e1ca-4f58-8b9e-e5969d1b9625", "type": "cryptographic-asset", "name": "certificate:542:542::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9440,7 +9440,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 542, "additionalContext": "scanoss:match,if err != nil {" } @@ -9454,7 +9454,7 @@ } }, { - "bom-ref": "d8120aad-5425-44d4-b6ea-d80b8f734c0e", + "bom-ref": "423a162c-caf6-498f-9d48-81922c64757e", "type": "cryptographic-asset", "name": "certificate:543:543::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9473,7 +9473,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 543, "additionalContext": "scanoss:match,return nil, fmt.Errorf(\"error reading cert: %s\", err)" } @@ -9487,7 +9487,7 @@ } }, { - "bom-ref": "c9cd864c-3e72-4295-b566-08bc95a27e1d", + "bom-ref": "f7973ee2-6053-4543-806b-8253871f8864", "type": "cryptographic-asset", "name": "certificate:543:543::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9506,7 +9506,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 543, "additionalContext": "scanoss:match,return nil, fmt.Errorf(\"error reading cert: %s\", err)" } @@ -9520,7 +9520,7 @@ } }, { - "bom-ref": "74f591b0-67ee-4f72-ad72-9a6b977bc8c3", + "bom-ref": "6736c513-b09d-46a4-adc6-c70dfa0ef438", "type": "cryptographic-asset", "name": "certificate:546:546::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9539,7 +9539,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 546, "additionalContext": "scanoss:match,keyPairCert, err := tls.X509KeyPair(certBytes, keyBytes)" } @@ -9553,7 +9553,7 @@ } }, { - "bom-ref": "83b8ca0e-75d4-48aa-ae98-858bfcd61514", + "bom-ref": "10c2546e-732e-4dad-8ce9-e4cd1dc14f4a", "type": "cryptographic-asset", "name": "certificate:546:546::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9572,7 +9572,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 546, "additionalContext": "scanoss:match,keyPairCert, err := tls.X509KeyPair(certBytes, keyBytes)" } @@ -9586,7 +9586,7 @@ } }, { - "bom-ref": "3f5e8654-f825-4b4c-89eb-1efa1a38abd7", + "bom-ref": "634aa8b8-bb98-4194-883c-af5b8aee9930", "type": "cryptographic-asset", "name": "certificate:546:546:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -9605,7 +9605,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 546, "additionalContext": "scanoss:match,keyPairCert, err := tls.X509KeyPair(certBytes, keyBytes)" } @@ -9617,7 +9617,7 @@ } }, { - "bom-ref": "7b591e6e-d3a0-488b-94eb-900f226fc3d0", + "bom-ref": "e80990ff-362d-437a-85c7-03f61ed5135c", "type": "cryptographic-asset", "name": "certificate:546:546:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -9636,7 +9636,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 546, "additionalContext": "scanoss:match,keyPairCert, err := tls.X509KeyPair(certBytes, keyBytes)" } @@ -9648,7 +9648,7 @@ } }, { - "bom-ref": "e27dffd3-d146-44ce-8766-b2d3165bc7d3", + "bom-ref": "c6e394de-99bf-4b62-88ea-1954db23408b", "type": "cryptographic-asset", "name": "certificate:547:547::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9667,7 +9667,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 547, "additionalContext": "scanoss:match,if err != nil {" } @@ -9681,7 +9681,7 @@ } }, { - "bom-ref": "019e59b6-2fc4-48ea-aa66-3b2f706f7075", + "bom-ref": "ad0236fb-de62-4143-9520-029d988e333f", "type": "cryptographic-asset", "name": "certificate:547:547::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9700,7 +9700,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 547, "additionalContext": "scanoss:match,if err != nil {" } @@ -9714,7 +9714,7 @@ } }, { - "bom-ref": "d5c3d4a1-6086-4b08-a61d-b14cde3a97df", + "bom-ref": "cb573d4b-191a-4f2d-8680-deaa26f35c25", "type": "cryptographic-asset", "name": "certificate:548:548::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9747,7 +9747,7 @@ } }, { - "bom-ref": "639280e0-885c-479a-a8ec-48b53cfa098c", + "bom-ref": "e5d57e9c-43c6-4f83-a108-3ca0dd09f6d3", "type": "cryptographic-asset", "name": "certificate:548:548::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9780,7 +9780,7 @@ } }, { - "bom-ref": "3db576a7-a412-4f68-b22a-0c6ac7f72230", + "bom-ref": "992b00a7-667b-4543-b05c-abf07f5cbf0d", "type": "cryptographic-asset", "name": "certificate:54:54::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9799,7 +9799,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 54, "additionalContext": "scanoss:match,if err != nil {" } @@ -9813,7 +9813,7 @@ } }, { - "bom-ref": "574d99e6-9aec-4ade-99cf-5a2c3f9f8f3e", + "bom-ref": "ace6a9cf-72b8-4660-a4e6-1956df7ea537", "type": "cryptographic-asset", "name": "certificate:54:54::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9832,7 +9832,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/cert_config.go", "line": 54, "additionalContext": "scanoss:match,if err != nil {" } @@ -9846,7 +9846,7 @@ } }, { - "bom-ref": "f6ca6d2e-2b72-44ce-bc81-4d1ba703702e", + "bom-ref": "8b1b0b34-ca4f-4812-bb41-b1825f7472a8", "type": "cryptographic-asset", "name": "certificate:550:550::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9879,7 +9879,7 @@ } }, { - "bom-ref": "bc74ae90-375e-42d6-8411-be9f1c678b38", + "bom-ref": "9eb5081f-1c76-4b40-9064-dc2b1825c68b", "type": "cryptographic-asset", "name": "certificate:550:550::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9912,7 +9912,7 @@ } }, { - "bom-ref": "342b6ea6-d242-4fa4-88d3-1b4b0244180f", + "bom-ref": "11c36100-57f7-472b-a58e-fd41d96c400a", "type": "cryptographic-asset", "name": "certificate:552:552::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9945,7 +9945,7 @@ } }, { - "bom-ref": "3ba6b85d-d939-470a-ae1d-0c6de99ed100", + "bom-ref": "95b4fa6d-a475-4c58-a0f5-2257013df1c9", "type": "cryptographic-asset", "name": "certificate:552:552::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -9978,7 +9978,7 @@ } }, { - "bom-ref": "f5fe8bb7-86e8-49ab-a2d7-09c07b91024d", + "bom-ref": "d3176967-fbab-41fd-8db2-138142078ed6", "type": "cryptographic-asset", "name": "certificate:552:552:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -10009,7 +10009,7 @@ } }, { - "bom-ref": "ee26f875-8029-40b9-8b7b-969fe7df0b2a", + "bom-ref": "dd64bdbd-199c-4b3c-b651-ee454d5b25cd", "type": "cryptographic-asset", "name": "certificate:55:55::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10042,7 +10042,7 @@ } }, { - "bom-ref": "6399d594-4ba5-466d-9068-8606fea3f95d", + "bom-ref": "d83dc78f-4e11-40d6-b4ab-c0d339a04250", "type": "cryptographic-asset", "name": "certificate:55:55::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10075,7 +10075,7 @@ } }, { - "bom-ref": "0dcab86d-5df9-40ab-94dd-43ce44c5ce7c", + "bom-ref": "dff8260e-7446-486d-b294-63eecb9dd7de", "type": "cryptographic-asset", "name": "certificate:55:55:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -10106,7 +10106,7 @@ } }, { - "bom-ref": "b9c540f5-695e-4d33-9aac-b10f4562b558", + "bom-ref": "74b0a952-8e49-48d8-88bc-b1e40b8a897b", "type": "cryptographic-asset", "name": "certificate:58:61::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10139,7 +10139,7 @@ } }, { - "bom-ref": "6ea0142d-6c31-4718-8f73-af260c5c9614", + "bom-ref": "d04362ea-7a25-456a-b8b7-84ad234d0edf", "type": "cryptographic-asset", "name": "certificate:58:61::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10172,7 +10172,7 @@ } }, { - "bom-ref": "36bb05b6-6bec-40f1-9ddb-8c371641a00a", + "bom-ref": "86088e06-26e3-47cf-b6fb-e57ed1d97dc6", "type": "cryptographic-asset", "name": "certificate:594:594:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -10191,7 +10191,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", + "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", "line": 594, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -10203,7 +10203,7 @@ } }, { - "bom-ref": "d9ec2f41-334f-4063-9780-9f8207e8e614", + "bom-ref": "0dd3837f-4770-4f29-a596-918b67d6ac42", "type": "cryptographic-asset", "name": "certificate:594:594:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -10222,7 +10222,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", + "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", "line": 594, "additionalContext": "scanoss:match,cert, err := x509.ParseCertificate(block.Bytes)" } @@ -10234,7 +10234,7 @@ } }, { - "bom-ref": "72ff3042-be5d-4905-a18f-3cb99e832a48", + "bom-ref": "9495b356-3ab1-4e24-8953-719f9fbc31d9", "type": "cryptographic-asset", "name": "certificate:602:602:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -10253,7 +10253,7 @@ ], "occurrences": [ { - "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", + "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", "line": 602, "additionalContext": "scanoss:match,return tls.X509KeyPair(certPEMBlock, keyPEMBlock)" } @@ -10265,7 +10265,7 @@ } }, { - "bom-ref": "cfbc20c9-2df3-4a32-8948-684ea2cdb65c", + "bom-ref": "cfdfc9ab-c277-4e62-9b66-b2b9b9d9afd8", "type": "cryptographic-asset", "name": "certificate:602:602:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -10284,7 +10284,7 @@ ], "occurrences": [ { - "location": "vendor-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", + "location": "etcd-deps/go.etcd.io/etcd/client/pkg/v3/transport/listener.go", "line": 602, "additionalContext": "scanoss:match,return tls.X509KeyPair(certPEMBlock, keyPEMBlock)" } @@ -10296,7 +10296,7 @@ } }, { - "bom-ref": "ecff8187-09cd-4b9b-a1cb-70b302b37f2a", + "bom-ref": "46e276b7-94ef-4197-98b1-785737363249", "type": "cryptographic-asset", "name": "certificate:63:63:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -10327,7 +10327,7 @@ } }, { - "bom-ref": "32cfd3ed-3d56-436d-ad30-10230fc4d0ad", + "bom-ref": "859a0440-30bc-49d7-b924-b5ebf29621a4", "type": "cryptographic-asset", "name": "certificate:63:63:algorithmPrimitive=other:api=x509.VerifyOptions:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:operation=verify", "evidence": { @@ -10358,7 +10358,7 @@ } }, { - "bom-ref": "980a04e4-af21-475a-8c8a-da7a046372a6", + "bom-ref": "7587eac9-39dc-412b-bb86-b666f318ecf4", "type": "cryptographic-asset", "name": "certificate:68:68:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -10389,7 +10389,7 @@ } }, { - "bom-ref": "bcc38dd5-0d88-469c-9c70-a507dc03ec7a", + "bom-ref": "f1b38440-79f2-4520-8c64-67617c2fb2d9", "type": "cryptographic-asset", "name": "certificate:694:694:algorithmPrimitive=other:api=Certificate.Verify:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -10420,7 +10420,7 @@ } }, { - "bom-ref": "82c4990d-03e0-409e-90c1-451755163b35", + "bom-ref": "ceaffcaf-c579-4466-9a6c-902b8a63d894", "type": "cryptographic-asset", "name": "certificate:69:69:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -10451,7 +10451,7 @@ } }, { - "bom-ref": "680a014d-3353-4ea9-8055-70e91d53cbf3", + "bom-ref": "edaa175f-cd34-4120-8b55-e6f75ca49576", "type": "cryptographic-asset", "name": "certificate:735:735:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -10482,7 +10482,7 @@ } }, { - "bom-ref": "ec504998-ff3f-4069-a8e2-449efdaad45d", + "bom-ref": "b5391b70-49a0-4624-bb8f-edd1698aad19", "type": "cryptographic-asset", "name": "certificate:73:73:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -10513,7 +10513,7 @@ } }, { - "bom-ref": "7f3083f8-2ab2-46ae-b548-ec3975b45e45", + "bom-ref": "ed7be3cf-7573-4a77-ae4f-5cb53e07df3e", "type": "cryptographic-asset", "name": "certificate:767:767:algorithmPrimitive=other:api=Certificate.CheckSignature:cryptoFunction=verify:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=verify", "evidence": { @@ -10544,7 +10544,7 @@ } }, { - "bom-ref": "a94e4417-1399-40ab-8f52-8879e127053e", + "bom-ref": "36514c64-b981-4c57-b1f4-6ab74ab66157", "type": "cryptographic-asset", "name": "certificate:809:809::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10563,7 +10563,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 809, "additionalContext": "scanoss:match,signerCert, err := issuer.SignCertificate(signerTemplate, signerPublicKey)" } @@ -10577,7 +10577,7 @@ } }, { - "bom-ref": "d4fe3d3d-15b7-4111-9f1a-48393451f64c", + "bom-ref": "d117a47a-f8b4-410d-800b-3ff5af1c1470", "type": "cryptographic-asset", "name": "certificate:809:809::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10596,7 +10596,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 809, "additionalContext": "scanoss:match,signerCert, err := issuer.SignCertificate(signerTemplate, signerPublicKey)" } @@ -10610,7 +10610,7 @@ } }, { - "bom-ref": "86353fda-b1f2-4023-9b4c-574388add4c3", + "bom-ref": "4dc7cc3c-38c3-46bd-916f-b983a0ed5926", "type": "cryptographic-asset", "name": "certificate:810:810::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10643,7 +10643,7 @@ } }, { - "bom-ref": "3095797e-7eb7-45a9-86ea-adee2d6f3815", + "bom-ref": "0dd88254-0c19-46e7-9e31-04a879482387", "type": "cryptographic-asset", "name": "certificate:810:810::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10676,7 +10676,7 @@ } }, { - "bom-ref": "30c172fa-912e-43ca-aea4-4b61d4a2756f", + "bom-ref": "c7923048-f8d7-4136-91fe-b0b5a597918a", "type": "cryptographic-asset", "name": "certificate:811:811::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10709,7 +10709,7 @@ } }, { - "bom-ref": "ababc9ff-79f8-431e-b527-f13d5d53693f", + "bom-ref": "e0cd7863-38b4-41e7-a4fd-51d9058c77e1", "type": "cryptographic-asset", "name": "certificate:811:811::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10742,7 +10742,7 @@ } }, { - "bom-ref": "5ff4c465-0370-42b9-ba9f-0d0baefc9034", + "bom-ref": "6fc23433-0931-400b-abf9-7aea7b67d4a7", "type": "cryptographic-asset", "name": "certificate:813:816::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10761,7 +10761,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 813, "additionalContext": "scanoss:match,signerConfig := \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{signerCert}, issuer.Config.Certs...), Key: signerPrivateKey, }" } @@ -10775,7 +10775,7 @@ } }, { - "bom-ref": "d2441b9a-bf38-4640-b1db-0e62da660c81", + "bom-ref": "01ba780f-b52c-443f-b807-d7893cff5eb8", "type": "cryptographic-asset", "name": "certificate:813:816::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10794,7 +10794,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 813, "additionalContext": "scanoss:match,signerConfig := \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{signerCert}, issuer.Config.Certs...), Key: signerPrivateKey, }" } @@ -10808,7 +10808,7 @@ } }, { - "bom-ref": "77091950-032e-443e-974b-606b5bc93166", + "bom-ref": "c8f6838b-d0ae-4356-b478-bbd45bad88d4", "type": "cryptographic-asset", "name": "certificate:817:817::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10827,7 +10827,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 817, "additionalContext": "scanoss:match,return signerConfig, nil" } @@ -10841,7 +10841,7 @@ } }, { - "bom-ref": "f83945b7-86fc-471c-84f6-b5fcea9e0afc", + "bom-ref": "3567861e-d9ba-4813-84ee-8cdc4a04f035", "type": "cryptographic-asset", "name": "certificate:817:817::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10860,7 +10860,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 817, "additionalContext": "scanoss:match,return signerConfig, nil" } @@ -10874,7 +10874,7 @@ } }, { - "bom-ref": "3a33eda1-e410-4c12-81ed-4b2236e60513", + "bom-ref": "7e6d2246-83e9-4c39-9009-797ea24fdcbb", "type": "cryptographic-asset", "name": "certificate:828:828::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteSubCA:certificateFileExtension=pem:certificateIsCA=true:certificateIsIntermediateCA=true:certificateKeyUsage=[keyCertSign digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=name:library=openshift/library-go", "evidence": { @@ -10893,7 +10893,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 828, "additionalContext": "scanoss:match,subCA, err := ca.MakeAndWriteSubCA(certFile, keyFile, serialFile, name, lifetime)" } @@ -10907,7 +10907,7 @@ } }, { - "bom-ref": "4506ddfe-9548-422f-b4c3-acac614938db", + "bom-ref": "76dc9787-7c5b-49f9-8528-55b8ff2fa23e", "type": "cryptographic-asset", "name": "certificate:828:828::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteSubCA:certificateFileExtension=pem:certificateIsCA=true:certificateIsIntermediateCA=true:certificateKeyUsage=[keyCertSign digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=name:library=openshift/library-go", "evidence": { @@ -10926,7 +10926,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 828, "additionalContext": "scanoss:match,subCA, err := ca.MakeAndWriteSubCA(certFile, keyFile, serialFile, name, lifetime)" } @@ -10940,7 +10940,7 @@ } }, { - "bom-ref": "789a29ef-5c70-4cd9-a67e-0c2987c3b816", + "bom-ref": "cbae2a13-93df-4e73-838f-4f17d8f343be", "type": "cryptographic-asset", "name": "certificate:828:828::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteSubCA:certificateIsCA=true:certificateIsIntermediateCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10959,7 +10959,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 828, "additionalContext": "scanoss:match,subCA, err := ca.MakeAndWriteSubCA(certFile, keyFile, serialFile, name, lifetime)" } @@ -10973,7 +10973,7 @@ } }, { - "bom-ref": "8adb99d5-0ff8-4503-9f1d-270e2bf110ca", + "bom-ref": "2db323b5-9670-4344-aae0-a48ddf7bc695", "type": "cryptographic-asset", "name": "certificate:828:828::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteSubCA:certificateIsCA=true:certificateIsIntermediateCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -10992,7 +10992,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 828, "additionalContext": "scanoss:match,subCA, err := ca.MakeAndWriteSubCA(certFile, keyFile, serialFile, name, lifetime)" } @@ -11006,7 +11006,7 @@ } }, { - "bom-ref": "5da9ff49-4fa5-47f3-85d2-61c7c0382759", + "bom-ref": "ff21f1d3-7fbb-4570-b3f7-9a3467888cea", "type": "cryptographic-asset", "name": "certificate:829:829::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteSubCA:certificateIsCA=true:certificateIsIntermediateCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11039,7 +11039,7 @@ } }, { - "bom-ref": "6aba511d-58c5-4888-970e-21246ee3fde3", + "bom-ref": "3b6760c8-d4f1-4442-9b3d-f370a3fc41b7", "type": "cryptographic-asset", "name": "certificate:829:829::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteSubCA:certificateIsCA=true:certificateIsIntermediateCA=true:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11072,7 +11072,7 @@ } }, { - "bom-ref": "10f65bf4-6504-494b-9115-1ea30cb63848", + "bom-ref": "eb0d479a-760b-409a-926e-4ec49fb13321", "type": "cryptographic-asset", "name": "certificate:838:838::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11105,7 +11105,7 @@ } }, { - "bom-ref": "15fed8d4-f226-421a-ab92-d2b9d4b670ee", + "bom-ref": "ca02bce9-b4e4-47a9-aefb-3b24c6774448", "type": "cryptographic-asset", "name": "certificate:838:838::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11138,7 +11138,7 @@ } }, { - "bom-ref": "7fe23495-20ae-4eb2-9d6b-752d77345b20", + "bom-ref": "9eb94162-7770-4d8f-a26a-9dc043c556ec", "type": "cryptographic-asset", "name": "certificate:839:839::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11171,7 +11171,7 @@ } }, { - "bom-ref": "855a084b-423d-4db6-a2e7-e649ea4b9195", + "bom-ref": "6e92bee0-200e-47bc-8748-38f60edf4917", "type": "cryptographic-asset", "name": "certificate:839:839::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11204,7 +11204,7 @@ } }, { - "bom-ref": "66451b4c-afa8-45f2-b732-a3e365ab8e36", + "bom-ref": "c9756115-6f28-40d0-bc72-9576fe0e6ecb", "type": "cryptographic-asset", "name": "certificate:840:840::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11237,7 +11237,7 @@ } }, { - "bom-ref": "2f0ba5c8-5a76-4e11-a9aa-4459c80967f1", + "bom-ref": "280fa928-d422-42bf-9efd-6ddbb2eaa120", "type": "cryptographic-asset", "name": "certificate:840:840::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11270,7 +11270,7 @@ } }, { - "bom-ref": "96379f4a-b653-46a1-b31d-41dcea4070ab", + "bom-ref": "9ee7bcb8-a6d3-46de-9f24-6b8d97b44806", "type": "cryptographic-asset", "name": "certificate:843:843::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11289,7 +11289,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 843, "additionalContext": "scanoss:match,if err := subCAConfig.WriteCertConfigFile(certFile, keyFile); err != nil {" } @@ -11303,7 +11303,7 @@ } }, { - "bom-ref": "0c68474d-a330-4b51-812e-f315af9d6970", + "bom-ref": "eb2bd4c4-b973-4b3c-998d-51d27ef8f90b", "type": "cryptographic-asset", "name": "certificate:843:843::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11322,7 +11322,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 843, "additionalContext": "scanoss:match,if err := subCAConfig.WriteCertConfigFile(certFile, keyFile); err != nil {" } @@ -11336,7 +11336,7 @@ } }, { - "bom-ref": "55625422-1a45-498e-ac88-cd40c0146352", + "bom-ref": "acbd4e85-d136-4fbb-960e-546bc0de16e4", "type": "cryptographic-asset", "name": "certificate:844:844::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11369,7 +11369,7 @@ } }, { - "bom-ref": "31e12a72-53bf-43d0-a588-0a837733e0eb", + "bom-ref": "e9a57174-fb01-4f58-ada7-f9f62ae7903d", "type": "cryptographic-asset", "name": "certificate:844:844::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11402,7 +11402,7 @@ } }, { - "bom-ref": "ab3574e2-ffe0-419e-834b-0ef4ebf515dc", + "bom-ref": "93a97065-6925-42c5-8b86-92b6182b7789", "type": "cryptographic-asset", "name": "certificate:85:85:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -11433,7 +11433,7 @@ } }, { - "bom-ref": "6f1fff60-fed6-456a-92c3-d15b064cef09", + "bom-ref": "79397fbd-6a44-4ab0-b0e7-e7a45617e83a", "type": "cryptographic-asset", "name": "certificate:862:865::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11452,7 +11452,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 862, "additionalContext": "scanoss:match,return \u0026CA{ Config: subCAConfig, SerialGenerator: serialGenerator, }, nil" } @@ -11466,7 +11466,7 @@ } }, { - "bom-ref": "9ecf8ce4-cd66-4edc-b828-780fa9c42430", + "bom-ref": "cfdcb847-e7d4-4f7f-b752-7dcbde5908ab", "type": "cryptographic-asset", "name": "certificate:862:865::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11485,7 +11485,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 862, "additionalContext": "scanoss:match,return \u0026CA{ Config: subCAConfig, SerialGenerator: serialGenerator, }, nil" } @@ -11499,7 +11499,7 @@ } }, { - "bom-ref": "a84b1f3b-2c2e-4648-9cdf-787bd9af54f6", + "bom-ref": "8182b97b-1e40-4792-ba50-6cde42ce0adc", "type": "cryptographic-asset", "name": "certificate:871:871::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteServerCert:certificateExtKeyUsage=[serverAuth]:certificateFileExtension=pem:certificateIsCA=false:certificateKeyUsage=[digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time_minus_1s:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSANs=hostnames:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11518,7 +11518,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 871, "additionalContext": "scanoss:match,certConfig, err = ca.MakeAndWriteServerCert(certFile, keyFile, hostnames, lifetime)" } @@ -11532,7 +11532,7 @@ } }, { - "bom-ref": "204c4e47-3f9e-4bd2-bec2-d8e078b302bc", + "bom-ref": "d48de778-fb17-4cc3-84f6-1dbfcc5d116e", "type": "cryptographic-asset", "name": "certificate:871:871::X.509:algorithmPrimitive=other:api=crypto.MakeAndWriteServerCert:certificateExtKeyUsage=[serverAuth]:certificateFileExtension=pem:certificateIsCA=false:certificateKeyUsage=[digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time_minus_1s:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSANs=hostnames:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11551,7 +11551,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 871, "additionalContext": "scanoss:match,certConfig, err = ca.MakeAndWriteServerCert(certFile, keyFile, hostnames, lifetime)" } @@ -11565,7 +11565,7 @@ } }, { - "bom-ref": "9fa63d37-59f8-4b5f-9596-217866e540f8", + "bom-ref": "713fbfe0-6a34-4c1d-84a3-d380dfb12797", "type": "cryptographic-asset", "name": "certificate:881:881:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -11596,7 +11596,7 @@ } }, { - "bom-ref": "d8e01d6a-bc8c-409b-9bc6-d29ecd74cb45", + "bom-ref": "a0b86387-81dc-485f-a502-dbfe55291e2c", "type": "cryptographic-asset", "name": "certificate:88:88:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -11615,7 +11615,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", + "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", "line": 88, "additionalContext": "scanoss:match,certDERBytes, err := x509.CreateCertificate(cryptorand.Reader, \u0026tmpl, \u0026tmpl, key.Public(), key)" } @@ -11627,7 +11627,7 @@ } }, { - "bom-ref": "52573f2c-9e56-4110-94c7-55c164d55800", + "bom-ref": "357a0b26-33b9-4161-b569-11c85abf6653", "type": "cryptographic-asset", "name": "certificate:88:88:algorithmPrimitive=other:api=x509.CreateCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -11646,7 +11646,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", + "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", "line": 88, "additionalContext": "scanoss:match,certDERBytes, err := x509.CreateCertificate(cryptorand.Reader, \u0026tmpl, \u0026tmpl, key.Public(), key)" } @@ -11658,7 +11658,7 @@ } }, { - "bom-ref": "f330d1f8-6bca-4041-8280-d4eb8b79de83", + "bom-ref": "fcfeccac-f86d-464b-b405-c655a48a5a7c", "type": "cryptographic-asset", "name": "certificate:88:88:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -11689,7 +11689,7 @@ } }, { - "bom-ref": "009956f5-a2c2-4683-a99d-5a08b940c067", + "bom-ref": "6906391a-45d0-462e-ab6a-eccd92fecddc", "type": "cryptographic-asset", "name": "certificate:901:901::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateFileExtension=pem:certificateIsCA=false:certificateKeyUsage=[digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time_minus_1s:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSANs=hostnames:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=server_hostname:library=openshift/library-go", "evidence": { @@ -11722,7 +11722,7 @@ } }, { - "bom-ref": "bc3956c4-4db5-40a8-be65-044dfc18b1b8", + "bom-ref": "737f5b74-8e5c-4868-821b-ddca85752e95", "type": "cryptographic-asset", "name": "certificate:901:901::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateFileExtension=pem:certificateIsCA=false:certificateKeyUsage=[digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time_minus_1s:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSANs=hostnames:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=server_hostname:library=openshift/library-go", "evidence": { @@ -11755,7 +11755,7 @@ } }, { - "bom-ref": "304c32f9-4c99-4cdd-8577-8bdc4812f190", + "bom-ref": "1f01cc0c-7d48-4bc0-a742-e0b5f7eef375", "type": "cryptographic-asset", "name": "certificate:901:901::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11774,7 +11774,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 901, "additionalContext": "scanoss:match,server, err := ca.MakeServerCert(hostnames, lifetime)" } @@ -11788,7 +11788,7 @@ } }, { - "bom-ref": "a343984d-1c19-43a6-bd2b-634095a4be33", + "bom-ref": "7f1e174f-14db-4bc2-a971-3c2489435d2d", "type": "cryptographic-asset", "name": "certificate:901:901::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11807,7 +11807,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 901, "additionalContext": "scanoss:match,server, err := ca.MakeServerCert(hostnames, lifetime)" } @@ -11821,7 +11821,7 @@ } }, { - "bom-ref": "fd8562d9-2680-4bad-b839-caa0c4ed07b9", + "bom-ref": "3b45cd20-987e-4e07-a785-b7c6727c5f55", "type": "cryptographic-asset", "name": "certificate:902:902::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11854,7 +11854,7 @@ } }, { - "bom-ref": "08793343-ebf5-43e1-a7eb-7cbcedeea3b6", + "bom-ref": "bebf6388-1b09-40ca-98d0-d6d9c93da48e", "type": "cryptographic-asset", "name": "certificate:902:902::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11887,7 +11887,7 @@ } }, { - "bom-ref": "95365cca-1480-4479-858b-ba145c52e3be", + "bom-ref": "98b85daf-f105-4e65-9cc0-581ee0df1022", "type": "cryptographic-asset", "name": "certificate:903:903::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11906,7 +11906,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 903, "additionalContext": "scanoss:match,return nil, err" } @@ -11920,7 +11920,7 @@ } }, { - "bom-ref": "961af934-9ae1-424c-9c11-0671f551f178", + "bom-ref": "5d6e8581-d76c-444a-b034-02bd6ec79bb6", "type": "cryptographic-asset", "name": "certificate:903:903::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11939,7 +11939,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 903, "additionalContext": "scanoss:match,return nil, err" } @@ -11953,7 +11953,7 @@ } }, { - "bom-ref": "7cea764a-fb45-416a-b84a-ecf1632b7d33", + "bom-ref": "a7c2062c-067c-4ead-8357-1e7dd3b58e2c", "type": "cryptographic-asset", "name": "certificate:905:905::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -11972,7 +11972,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 905, "additionalContext": "scanoss:match,if err := server.WriteCertConfigFile(certFile, keyFile); err != nil {" } @@ -11986,7 +11986,7 @@ } }, { - "bom-ref": "b1c63e98-04ac-4634-9df2-cd5da285a545", + "bom-ref": "42b71c77-b2dc-413e-a561-f297c6a09fca", "type": "cryptographic-asset", "name": "certificate:905:905::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12005,7 +12005,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 905, "additionalContext": "scanoss:match,if err := server.WriteCertConfigFile(certFile, keyFile); err != nil {" } @@ -12019,7 +12019,7 @@ } }, { - "bom-ref": "1f0c8f33-9eeb-465a-9fdf-d173f4c8c5ce", + "bom-ref": "1fee07e3-7b9e-4b74-98c6-7169a9dd866a", "type": "cryptographic-asset", "name": "certificate:906:906::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12052,7 +12052,7 @@ } }, { - "bom-ref": "12cb12c0-da39-4b96-8cda-bfbe732a93d1", + "bom-ref": "5d76a474-7cb1-4c18-b13d-f03316670974", "type": "cryptographic-asset", "name": "certificate:906:906::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12085,7 +12085,7 @@ } }, { - "bom-ref": "ce3e7493-0335-4ed6-8833-d225278a3b83", + "bom-ref": "5d487cb0-7e95-4e3a-8938-0c02de563258", "type": "cryptographic-asset", "name": "certificate:906:906:algorithmPrimitive=other:api=x509.Parse:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -12116,7 +12116,7 @@ } }, { - "bom-ref": "4815355f-745d-49a5-8b23-74a7ecacdd4f", + "bom-ref": "6ff5993f-113e-4e87-b64c-e078911e4616", "type": "cryptographic-asset", "name": "certificate:908:908::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12135,7 +12135,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 908, "additionalContext": "scanoss:match,return server, nil" } @@ -12149,7 +12149,7 @@ } }, { - "bom-ref": "2463fb0f-9676-4af2-9924-ebc2312a5cbf", + "bom-ref": "e292f040-448d-4ef3-a8d9-daf2645eb684", "type": "cryptographic-asset", "name": "certificate:908:908::X.509:algorithmPrimitive=other:api=crypto.MakeServerCert:certificateExtKeyUsage=[serverAuth]:certificateIsCA=false:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12168,7 +12168,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 908, "additionalContext": "scanoss:match,return server, nil" } @@ -12182,7 +12182,7 @@ } }, { - "bom-ref": "e899de13-1a46-4e0c-8b07-edd5496a0edc", + "bom-ref": "0a814c99-c3d3-434e-9496-381e8260d840", "type": "cryptographic-asset", "name": "certificate:919:919:algorithmPrimitive=other:api=x509.Create:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -12213,7 +12213,7 @@ } }, { - "bom-ref": "0384081d-50bd-43b9-bde7-b9399a6abf3b", + "bom-ref": "561c246a-52d3-47f6-a045-b4c6cd25eae5", "type": "cryptographic-asset", "name": "certificate:91:91:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -12244,7 +12244,7 @@ } }, { - "bom-ref": "2707728b-3f15-419f-a1e4-4b038ae71235", + "bom-ref": "7debfa55-a638-4666-8ae7-d6730ff66cfa", "type": "cryptographic-asset", "name": "certificate:925:925::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12277,7 +12277,7 @@ } }, { - "bom-ref": "f05e35c4-5c8b-4f6d-a88c-cced631bc5b3", + "bom-ref": "a5f5f5b3-e0f1-41b5-9a4f-950d6719e424", "type": "cryptographic-asset", "name": "certificate:925:925::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12310,7 +12310,7 @@ } }, { - "bom-ref": "9d0155f5-046d-4216-a556-2596f8575364", + "bom-ref": "faf798a7-86a8-4f30-a74d-366ccff6e644", "type": "cryptographic-asset", "name": "certificate:926:926::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12343,7 +12343,7 @@ } }, { - "bom-ref": "ce935878-d61a-4cf4-8561-62a82b659c51", + "bom-ref": "7b9101d9-c1c5-496c-a6a0-affecc6bb88d", "type": "cryptographic-asset", "name": "certificate:926:926::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12376,7 +12376,7 @@ } }, { - "bom-ref": "730c1670-1ef1-4038-a8bd-7fd393ed5510", + "bom-ref": "c2b9a41b-112a-4fd7-89d3-87fa29a6698d", "type": "cryptographic-asset", "name": "certificate:927:927::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12409,7 +12409,7 @@ } }, { - "bom-ref": "29d24c17-4530-484b-a06a-00033ed4369e", + "bom-ref": "9b0aec48-0c7b-4d85-adc5-f358c844f3a0", "type": "cryptographic-asset", "name": "certificate:927:927::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12442,7 +12442,7 @@ } }, { - "bom-ref": "4004dcf9-7479-4852-8dfa-63d8383a571d", + "bom-ref": "e2e1e86d-b764-4802-b2ed-3e5a2ad40f69", "type": "cryptographic-asset", "name": "certificate:929:932::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12461,7 +12461,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 929, "additionalContext": "scanoss:match,server := \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{serverCrt}, ca.Config.Certs...), Key: serverPrivateKey, }" } @@ -12475,7 +12475,7 @@ } }, { - "bom-ref": "b199f980-482a-4b1b-ac06-4f224bd0cf30", + "bom-ref": "9a77a918-9d72-40fd-a613-2543278da132", "type": "cryptographic-asset", "name": "certificate:929:932::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12494,7 +12494,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 929, "additionalContext": "scanoss:match,server := \u0026TLSCertificateConfig{ Certs: append([]*x509.Certificate{serverCrt}, ca.Config.Certs...), Key: serverPrivateKey, }" } @@ -12508,7 +12508,7 @@ } }, { - "bom-ref": "b706490f-8fd5-4a8b-815b-32c4206ad50b", + "bom-ref": "ae481f19-336e-4858-8ff4-a8e98910857c", "type": "cryptographic-asset", "name": "certificate:92:92:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -12527,7 +12527,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", + "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", "line": 92, "additionalContext": "scanoss:match,return x509.ParseCertificate(certDERBytes)" } @@ -12539,7 +12539,7 @@ } }, { - "bom-ref": "79f12f98-d60b-485e-842c-a747a9a76e4d", + "bom-ref": "f701f318-857e-473a-9576-8040737163c6", "type": "cryptographic-asset", "name": "certificate:92:92:algorithmPrimitive=other:api=x509.ParseCertificate:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -12558,7 +12558,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/cert/cert.go", + "location": "vendor-deps/k8s.io/client-go/util/cert/cert.go", "line": 92, "additionalContext": "scanoss:match,return x509.ParseCertificate(certDERBytes)" } @@ -12570,7 +12570,7 @@ } }, { - "bom-ref": "d840981d-cb40-47b0-b640-123044be8b9a", + "bom-ref": "b5a21a13-81f3-4dce-85c7-845f7ce9a043", "type": "cryptographic-asset", "name": "certificate:933:933::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12589,7 +12589,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 933, "additionalContext": "scanoss:match,return server, nil" } @@ -12603,7 +12603,7 @@ } }, { - "bom-ref": "f2e6ab06-910d-47de-9621-7e566fa94cf3", + "bom-ref": "f25f9e8a-3046-4031-88d2-c6781f40ca12", "type": "cryptographic-asset", "name": "certificate:933:933::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12622,7 +12622,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 933, "additionalContext": "scanoss:match,return server, nil" } @@ -12636,7 +12636,7 @@ } }, { - "bom-ref": "810d1a07-e9ed-47e6-b4c8-4f5c78f67ec6", + "bom-ref": "b63b9eee-6239-47c5-bfa8-9c59d46d3e0c", "type": "cryptographic-asset", "name": "certificate:93:93:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -12655,7 +12655,7 @@ ], "occurrences": [ { - "location": "etcd-deps/k8s.io/client-go/util/cert/io.go", + "location": "vendor-deps/k8s.io/client-go/util/cert/io.go", "line": 93, "additionalContext": "scanoss:match,pool := x509.NewCertPool()" } @@ -12667,7 +12667,7 @@ } }, { - "bom-ref": "af8dea4f-c63a-4c06-bbf1-57a0178cd977", + "bom-ref": "30211a26-c0ff-49d2-91bc-64a8888ae4e3", "type": "cryptographic-asset", "name": "certificate:93:93:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -12686,7 +12686,7 @@ ], "occurrences": [ { - "location": "vendor-deps/k8s.io/client-go/util/cert/io.go", + "location": "etcd-deps/k8s.io/client-go/util/cert/io.go", "line": 93, "additionalContext": "scanoss:match,pool := x509.NewCertPool()" } @@ -12698,7 +12698,7 @@ } }, { - "bom-ref": "22467d92-0631-4ad9-a837-cf73db092a4d", + "bom-ref": "2c18a798-1444-4a32-9e45-809011a076c9", "type": "cryptographic-asset", "name": "certificate:946:946::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12717,7 +12717,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 946, "additionalContext": "scanoss:match,serverCrt, err := ca.SignCertificate(serverTemplate, serverPublicKey)" } @@ -12731,7 +12731,7 @@ } }, { - "bom-ref": "40adfe88-46f8-4e26-941e-0ed15a49195a", + "bom-ref": "01e82a84-f595-43fe-b923-74c911bb1498", "type": "cryptographic-asset", "name": "certificate:946:946::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12750,7 +12750,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 946, "additionalContext": "scanoss:match,serverCrt, err := ca.SignCertificate(serverTemplate, serverPublicKey)" } @@ -12764,7 +12764,7 @@ } }, { - "bom-ref": "677ce267-886a-4303-9048-a03e4c64fb8f", + "bom-ref": "a3ac19a7-e030-4a9b-999c-d2f4536f964c", "type": "cryptographic-asset", "name": "certificate:947:947::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12783,7 +12783,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 947, "additionalContext": "scanoss:match,if err != nil {" } @@ -12797,7 +12797,7 @@ } }, { - "bom-ref": "2a4bc643-346e-4306-929e-c5a7fe5fb049", + "bom-ref": "2a8f1bfd-6e6c-4a93-ac03-3f270a053937", "type": "cryptographic-asset", "name": "certificate:947:947::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12816,7 +12816,7 @@ ], "occurrences": [ { - "location": "vendor-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", + "location": "etcd-deps/github.com/openshift/library-go/pkg/crypto/crypto.go", "line": 947, "additionalContext": "scanoss:match,if err != nil {" } @@ -12830,7 +12830,7 @@ } }, { - "bom-ref": "e241ceb1-9ec9-4919-b7cc-1acf902b227c", + "bom-ref": "538b42fe-8d4a-4f67-a824-b5a971f2af23", "type": "cryptographic-asset", "name": "certificate:948:948::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12863,7 +12863,7 @@ } }, { - "bom-ref": "01a8f4d2-ccf4-4fbd-a022-d05146d1db04", + "bom-ref": "6be19082-3408-4c40-8e91-ceaf3e2c6c6e", "type": "cryptographic-asset", "name": "certificate:948:948::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12896,7 +12896,7 @@ } }, { - "bom-ref": "321b6f48-38f2-4729-a5e5-9e942fe9fb97", + "bom-ref": "d33fb861-52b9-4a09-a81c-27c86d8bca92", "type": "cryptographic-asset", "name": "certificate:94:94:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -12915,7 +12915,7 @@ ], "occurrences": [ { - "location": "etcd-deps/github.com/openshift/microshift/pkg/util/net.go", + "location": "pkg/util/net.go", "line": 94, "additionalContext": "scanoss:match,rootCAs = x509.NewCertPool()" } @@ -12927,7 +12927,7 @@ } }, { - "bom-ref": "928be9fc-a74b-46a1-9bae-adc2061046bb", + "bom-ref": "bd7769ea-96d5-4d40-8024-1640a7717410", "type": "cryptographic-asset", "name": "certificate:94:94:algorithmPrimitive=other:api=x509.NewCertPool:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=generated:operation=other", "evidence": { @@ -12946,7 +12946,7 @@ ], "occurrences": [ { - "location": "pkg/util/net.go", + "location": "etcd-deps/github.com/openshift/microshift/pkg/util/net.go", "line": 94, "additionalContext": "scanoss:match,rootCAs = x509.NewCertPool()" } @@ -12958,7 +12958,7 @@ } }, { - "bom-ref": "336b76d6-bc5e-42ca-a390-05da1fdb5379", + "bom-ref": "c514577b-8a90-429b-bf9a-6fdf339c25d2", "type": "cryptographic-asset", "name": "certificate:950:953::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -12991,7 +12991,7 @@ } }, { - "bom-ref": "23876a57-feb3-4803-847d-8f1318921662", + "bom-ref": "5142c0f2-ee01-4291-90e1-db23473d4470", "type": "cryptographic-asset", "name": "certificate:950:953::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -13024,7 +13024,7 @@ } }, { - "bom-ref": "089abd13-3bf9-4d10-b263-b5999ba86a70", + "bom-ref": "c5b8673d-b2aa-485a-b5b1-d8022f30598e", "type": "cryptographic-asset", "name": "certificate:954:954::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -13057,7 +13057,7 @@ } }, { - "bom-ref": "0b195011-1b59-4e98-87f9-ae2016930d32", + "bom-ref": "86efa92a-6d21-4a10-bf68-28aca0e2426a", "type": "cryptographic-asset", "name": "certificate:954:954::X.509:algorithmPrimitive=other:api=crypto.SignCertificate:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:library=openshift/library-go", "evidence": { @@ -13090,7 +13090,7 @@ } }, { - "bom-ref": "8014b547-dc78-4f63-831d-e013107deecf", + "bom-ref": "2edc0d21-74a5-4d0b-ade0-0ca7e5458b16", "type": "cryptographic-asset", "name": "certificate:95:95:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -13121,7 +13121,7 @@ } }, { - "bom-ref": "5a998aed-8d73-4727-8486-5a0f4d6aee40", + "bom-ref": "d31b9cdb-da2d-4e91-bb28-e8d318ae1766", "type": "cryptographic-asset", "name": "certificate:95:95:algorithmPrimitive=other:api=CertPool.AddCert:cryptoFunction=other:findingType=certificate_handling:library=crypto/x509:materialSource=loaded:operation=other", "evidence": { @@ -13152,7 +13152,7 @@ } }, { - "bom-ref": "cd24edc5-f247-46e1-a962-a91b46024ef6", + "bom-ref": "f5b34c61-2ff2-4181-9811-655f28df10f9", "type": "cryptographic-asset", "name": "certificate:960:960::X.509:algorithmPrimitive=other:api=crypto.MakeClientCertificate:certificateExtKeyUsage=[clientAuth]:certificateFileExtension=pem:certificateIsCA=false:certificateKeyUsage=[digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time_minus_1s:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=client_user:library=openshift/library-go", "evidence": { @@ -13185,7 +13185,7 @@ } }, { - "bom-ref": "81bc12d0-79b3-432f-b73a-0fa9ccedd6c7", + "bom-ref": "3b44d0c3-8db4-438d-b21d-b9942cea6a8e", "type": "cryptographic-asset", "name": "certificate:960:960::X.509:algorithmPrimitive=other:api=crypto.MakeClientCertificate:certificateExtKeyUsage=[clientAuth]:certificateFileExtension=pem:certificateIsCA=false:certificateKeyUsage=[digitalSignature keyEncipherment]:certificateNotValidAfter=current_time_plus_lifetime:certificateNotValidBefore=current_time_minus_1s:certificatePublicKeyAlgorithm=RSA:certificatePublicKeySize=2048:certificateSignatureAlgorithm=SHA256WithRSA:certificateState=[active]:certificateSubjectName=client_user:library=openshift/library-go", "evidence": { @@ -13218,7 +13218,7 @@ } }, { - "bom-ref": "003b9437-e75f-4471-969f-4bf7af65d325", + "bom-ref": "d8376693-43da-4e15-ae9b-74781aa7530c", "type": "cryptographic-asset", "name": "certificate:972:972:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -13249,7 +13249,7 @@ } }, { - "bom-ref": "55920c86-ebfd-4523-ab59-8758393efd19", + "bom-ref": "88d566e7-607a-4033-8738-18c4c46cd957", "type": "cryptographic-asset", "name": "certificate:99:99:algorithmPrimitive=other:api=tls.LoadX509KeyPair:cryptoFunction=other:findingType=certificate_handling:library=crypto/tls:materialSource=loaded:operation=other", "evidence": { @@ -13280,7 +13280,7 @@ } }, { - "bom-ref": "a0d82aa3-3498-4141-ad4f-be8f60ce189f", + "bom-ref": "2495b795-b345-4b8d-8c97-bb021a4f54b6", "type": "cryptographic-asset", "name": "other", "description": "Cryptographic other", @@ -13351,7 +13351,7 @@ } }, { - "bom-ref": "58fb3c18-de27-470f-9cea-fa57e9a4ac66", + "bom-ref": "2422ed81-d52e-46f6-af65-a075728440d2", "type": "cryptographic-asset", "name": "private-key", "description": "Cryptographic private-key", @@ -13468,7 +13468,7 @@ } }, { - "bom-ref": "3c732925-9795-4292-b43a-18b55130bc89", + "bom-ref": "5ace631d-f341-4702-b9c8-312fe956b22e", "type": "cryptographic-asset", "name": "tls-1.0", "evidence": { @@ -13532,7 +13532,7 @@ } }, { - "bom-ref": "de458210-fd5a-4069-8966-6ec28fa6b9ae", + "bom-ref": "3062b50b-233a-44c4-b5b0-26a62472642d", "type": "cryptographic-asset", "name": "tls-1.1", "evidence": { @@ -13596,7 +13596,7 @@ } }, { - "bom-ref": "12fa1513-b69b-485d-85de-f75b13bed547", + "bom-ref": "85e38667-b63b-47fa-8a02-40926b9721ce", "type": "cryptographic-asset", "name": "tls-1.2", "evidence": { @@ -13755,7 +13755,7 @@ } }, { - "bom-ref": "0fd29735-b1fa-4b7f-a7cf-e927336507c4", + "bom-ref": "325e798a-9c97-4a7f-b133-4d03b5b25c36", "type": "cryptographic-asset", "name": "tls-1.3", "evidence": { @@ -13849,7 +13849,7 @@ } }, { - "bom-ref": "30a7831a-8f5a-4ea0-884d-55da5223120b", + "bom-ref": "2b48169e-8b3d-4ab2-ab2f-40b8dc1d85ab", "type": "cryptographic-asset", "name": "tls-SSL3.0", "evidence": { @@ -13883,7 +13883,7 @@ } }, { - "bom-ref": "639608f0-f641-4971-b137-30d2e571958f", + "bom-ref": "47793d97-c80d-4fa1-9558-f6cf0e79ad80", "type": "cryptographic-asset", "name": "tls", "evidence": { @@ -13986,7 +13986,7 @@ } }, { - "bom-ref": "91d0bfc4-c078-4924-a536-a59b14575572", + "bom-ref": "64baf7ab-1d71-4292-b671-314cbb03a117", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14025,7 +14025,7 @@ } }, { - "bom-ref": "7d2315db-2f5b-47e6-8e63-6c8b4577348c", + "bom-ref": "5f3d3686-0b8c-4dc6-a8bf-73a22108613d", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14064,7 +14064,7 @@ } }, { - "bom-ref": "6218ae8c-e4d5-475e-833b-a480157b721d", + "bom-ref": "80b50cb7-4127-4bf0-afb3-cb9e24cf7038", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14103,7 +14103,7 @@ } }, { - "bom-ref": "9d70297b-9a01-4da6-89aa-b0fe8a98f369", + "bom-ref": "54feb415-45bb-4d40-b558-1f7feafa26b8", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14142,7 +14142,7 @@ } }, { - "bom-ref": "6c15c876-3959-4df3-88df-c05ff3d322ff", + "bom-ref": "3ab1ff38-9626-4c1c-9309-5f93694ec0e7", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14181,7 +14181,7 @@ } }, { - "bom-ref": "8d71eb5c-7379-40ed-bbec-c3cbd4b9e79a", + "bom-ref": "6acadbb7-8286-43be-803d-a92df317b34f", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14215,7 +14215,7 @@ } }, { - "bom-ref": "c0427273-5637-4421-9c23-25e7d3fb172d", + "bom-ref": "b3f1faab-17e0-4b3d-a04c-98cc7594d377", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14249,7 +14249,7 @@ } }, { - "bom-ref": "97c505a4-7230-4b73-ad6b-943041317697", + "bom-ref": "c3206c31-323a-43c3-beb4-4e50048de71a", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14288,7 +14288,7 @@ } }, { - "bom-ref": "f8c9a1c3-04a8-491a-a887-79c90f2ec792", + "bom-ref": "1b36dbea-e232-40a9-96fd-ff6d80144bc5", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14327,7 +14327,7 @@ } }, { - "bom-ref": "06018314-96b1-44b0-87a7-44b96f7ad01b", + "bom-ref": "54adaa17-1d3f-4e20-bc59-f0888206b926", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14366,7 +14366,7 @@ } }, { - "bom-ref": "bd9292ff-b443-47a5-a148-dc8b136647be", + "bom-ref": "d0410230-47bd-402d-a572-3214c0d207cd", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14400,7 +14400,7 @@ } }, { - "bom-ref": "06a2850d-fef6-4c10-9ea8-82fc5001605c", + "bom-ref": "c786f56a-bb71-4777-a1d2-3c92730d2ef6", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14434,7 +14434,7 @@ } }, { - "bom-ref": "0b7d2681-cf55-4760-b5cf-6b68474ab4b8", + "bom-ref": "05040317-1a4f-4524-8dc3-1eaf44a94ce6", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14468,7 +14468,7 @@ } }, { - "bom-ref": "d1c9ab27-5eeb-4e7a-baad-7a3e9010a442", + "bom-ref": "e38897fc-29c9-4bb0-a5ff-71e0af50bec4", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -14507,7 +14507,7 @@ } }, { - "bom-ref": "75f1e466-1cda-429e-bcc3-ff1c6e463e5c", + "bom-ref": "7fed8469-eda1-4f8d-a27d-d0395d0b7630", "type": "cryptographic-asset", "name": "tls-unknown", "evidence": { @@ -15056,7 +15056,7 @@ } }, { - "bom-ref": "f8b2a008-0b22-4c6c-ad5c-0341909c1bd0", + "bom-ref": "bbb67db4-e090-4796-a884-6d2bb240d518", "type": "cryptographic-asset", "name": "public-key", "description": "Cryptographic public-key", @@ -15172,7 +15172,7 @@ } }, { - "bom-ref": "b09af0f0-a9fc-4679-9975-fdc6bb6c8612", + "bom-ref": "0bb01761-7963-4c0b-a104-520b6ae9115e", "type": "cryptographic-asset", "name": "signature", "description": "Cryptographic signature", diff --git a/etcd/go.mod b/etcd/go.mod index 4659600a8c..f7f57978a9 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -5,7 +5,7 @@ go 1.26.3 replace github.com/openshift/microshift => ../ require ( - github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9 + github.com/openshift/api v0.0.0-20261022144628-c3d7aef33fc1 github.com/openshift/build-machinery-go v0.0.0-20260902143904-520f675c892b github.com/openshift/microshift v0.0.0-00010101000000-000000000000 github.com/spf13/cobra v1.10.2 @@ -19,10 +19,7 @@ require ( sigs.k8s.io/yaml v1.6.0 ) -require ( - github.com/go-openapi/swag/pools v0.27.1 // indirect - go.yaml.in/yaml/v2 v2.4.4 // indirect -) +require go.yaml.in/yaml/v2 v2.4.4 // indirect require ( github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect @@ -56,6 +53,7 @@ require ( github.com/go-openapi/swag/loading v0.27.1 // indirect github.com/go-openapi/swag/mangling v0.27.1 // indirect github.com/go-openapi/swag/netutils v0.27.1 // indirect + github.com/go-openapi/swag/pools v0.27.1 // indirect github.com/go-openapi/swag/stringutils v0.27.1 // indirect github.com/go-openapi/swag/typeutils v0.27.1 // indirect github.com/go-openapi/swag/yamlutils v0.27.1 // indirect @@ -81,7 +79,7 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.2.0 // indirect - github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7 // indirect + github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect diff --git a/etcd/go.sum b/etcd/go.sum index 3a3609d742..870e450e3b 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -146,8 +146,8 @@ github.com/oklog/run v1.2.0 h1:O8x3yXwah4A73hJdlrwo/2X6J62gE5qTMusH0dvz60E= github.com/oklog/run v1.2.0/go.mod h1:mgDbKRSwPhJfesJ4PntqFUbKQRZ50NgmZTSPlFA0YFk= github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc= github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= -github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9 h1:zs8Qkv9t4ZVomQAsu7Q8ZB74O9Wegnq02IK+KLRDknQ= -github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9/go.mod h1:2oI3aXQFDjjl7l4xA9ZPSkB+l+lyfWLg7P2sWg9yEvM= +github.com/openshift/api v0.0.0-20261022144628-c3d7aef33fc1 h1:w3AfeyLv+GFNFgJT3yBsHIBjcM41r1CNdA/Wkp/FKoc= +github.com/openshift/api v0.0.0-20261022144628-c3d7aef33fc1/go.mod h1:2oI3aXQFDjjl7l4xA9ZPSkB+l+lyfWLg7P2sWg9yEvM= github.com/openshift/build-machinery-go v0.0.0-20260902143904-520f675c892b h1:ErTc+6D1n/rpRaUYP++h0YlOzM+q7UaAdqDZrzhA0ho= github.com/openshift/build-machinery-go v0.0.0-20260902143904-520f675c892b/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260924184947-8480451b19d3 h1:ldoWzCppCrx5Ky2E0fsq6ePABTGYfdxlKqfVAvIMa3Y= @@ -160,8 +160,8 @@ github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260924184947-8480451b19d3 h1 github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260924184947-8480451b19d3/go.mod h1:YDonhdT0PCdcd/av/IyhXLNNcZk/nVCGZ38iyYFfAHU= github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260924184947-8480451b19d3 h1:3Gu8B+e3o/tPUnkwqulFNM0Au+80z4RrYZZgy5T2478= github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260924184947-8480451b19d3/go.mod h1:BMrN+9LMvg7hwEuopgCAQ+OsQv3ycg8idkjPJIr3vmA= -github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7 h1:PDH/v+jap31Eb4N9q+Q3X05QHIXZA4sVyr4zb/n+Cv0= -github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7/go.mod h1:k0EA2kHPdvdKgyV38lWS1u1eIgMBgrpWkCl2ei4A3ug= +github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4 h1:pDBleqJg6DPCMrEaJKGFbr+gnvXqm9z2SqQvTibEcrg= +github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4/go.mod h1:g3KONLBdxKU5r4K/Qcgg29Re5Rdx9URj0ZelXFGLxGo= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20260807173042-3ac00363bb14 h1:cqKhyYc25PdUmFFVrxX5oqiltnWn6UWrdoZRWVFSSCQ= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20260807173042-3ac00363bb14/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= diff --git a/etcd/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/etcd/vendor/github.com/openshift/api/config/v1/types_infrastructure.go index 857f9b2792..a0375adff8 100644 --- a/etcd/vendor/github.com/openshift/api/config/v1/types_infrastructure.go +++ b/etcd/vendor/github.com/openshift/api/config/v1/types_infrastructure.go @@ -71,6 +71,22 @@ type InfrastructureSpec struct { // +kubebuilder:validation:Enum=HighlyAvailable;SingleReplica // +optional ControlPlaneTopology TopologyMode `json:"controlPlaneTopology,omitempty"` + + // infrastructureTopology expresses the desired topology for infrastructure + // services that do not run on control plane nodes, indicating how + // infrastructure workloads are distributed across nodes. + // + // When omitted, no topology transition override has been expressed. + // Once populated, the field represents the desired topology state. + // + // When the value differs from status.infrastructureTopology, the cluster + // evaluates whether the requested transition can proceed. Not all + // transitions may be permitted. + // + // +openshift:enable:FeatureGate=MutableTopology + // +kubebuilder:validation:Enum=HighlyAvailable;SingleReplica + // +optional + InfrastructureTopology TopologyMode `json:"infrastructureTopology,omitempty"` } // InfrastructureStatus describes the infrastructure the cluster is leveraging. @@ -138,6 +154,16 @@ type InfrastructureStatus struct { // +optional InfrastructureTopology TopologyMode `json:"infrastructureTopology,omitempty"` + // topologyTransitionStatus reports evaluations of supported topology transitions + // and the status of a requested transition, if any. + // It is optional and is omitted until the topology controller reports transition status. + // A transition is requested through spec.controlPlaneTopology. The controller + // reports completion only after both topologies reach that transition's target + // and post-transition checks pass; reaching the target topology alone is not completion. + // +openshift:enable:FeatureGate=MutableTopology + // +optional + TopologyTransitionStatus TopologyTransitionStatus `json:"topologyTransitionStatus,omitzero"` + // cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. // CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. // Valid values are "None" and "AllNodes". When omitted, the default value is "None". diff --git a/etcd/vendor/github.com/openshift/api/config/v1/types_infrastructure_transitions.go b/etcd/vendor/github.com/openshift/api/config/v1/types_infrastructure_transitions.go new file mode 100644 index 0000000000..113d3b2116 --- /dev/null +++ b/etcd/vendor/github.com/openshift/api/config/v1/types_infrastructure_transitions.go @@ -0,0 +1,170 @@ +package v1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// TopologyState describes the control-plane and infrastructure topology at one +// end of a topology transition. +// The topology controller determines which transitions are supported. Currently, +// it supports only transitions that change both topologies from SingleReplica to +// HighlyAvailable. Representing a topology here does not enable a transition to it. +type TopologyState struct { + // controlPlaneTopology is the topology of the control-plane nodes. Valid values + // are HighlyAvailable, HighlyAvailableArbiter, and SingleReplica. + // External is not valid: transitions cannot involve an externally hosted control plane. + // SingleReplica means a single instance of control-plane services is expected + // to meet cluster needs. HighlyAvailable means multiple instances are expected + // to provide redundancy. HighlyAvailableArbiter means two control-plane nodes + // and a smaller arbiter node to maintain quorum. + // See https://pkg.go.dev/github.com/openshift/api/config/v1#TopologyMode for + // topology definitions. + // controlPlaneTopology is required. + // +kubebuilder:validation:Enum=HighlyAvailable;HighlyAvailableArbiter;SingleReplica + // +required + ControlPlaneTopology TopologyMode `json:"controlPlaneTopology,omitempty"` + + // infrastructureTopology is the topology of infrastructure services. Valid + // values are SingleReplica and HighlyAvailable. + // SingleReplica means operators expect a single instance of infrastructure + // services to meet cluster needs. + // HighlyAvailable means operators expect multiple instances of infrastructure + // services to provide redundancy. + // infrastructureTopology is required. + // +kubebuilder:validation:Enum=SingleReplica;HighlyAvailable + // +required + InfrastructureTopology TopologyMode `json:"infrastructureTopology,omitempty"` +} + +const ( + // TopologyTransitionsEvaluatedConditionType indicates whether supported transition types have been evaluated. + // + // The controller always reports this condition when topologyTransitionStatus is + // set. It reports Unknown before evaluation and while checks are being refreshed, + // True when evaluation finishes successfully (even if no transitions are supported + // or available), and False when evaluation cannot finish. It retains the last + // results while refreshing checks or reporting an evaluation failure. Clients + // must treat those results as stale unless this condition is True. + TopologyTransitionsEvaluatedConditionType = "TopologyTransitionsEvaluated" + + // TopologyTransitionCompletedConditionType indicates the status of the current or most recent transition. + // + // The controller always reports this condition when topologyTransitionStatus is + // set. It reports Unknown before a transition is requested, True after both + // topologies reach the requested transition's target and post-transition checks + // pass, and False while the transition is in progress or blocked. + // Reaching the target topology alone does not mean the transition is complete: + // this condition remains False while post-transition checks are pending or failing. + TopologyTransitionCompletedConditionType = "TopologyTransitionCompleted" + + // TopologyTransitionAvailableConditionType indicates if a type of transition is available based on + // the most recently evaluated state of the cluster. + // + // TopologyTransitionAvailableConditionType is Unknown before evaluation, True when evaluations + // for the given transition succeed, and False when one or more evaluations for a transition fail. + // Because the controller clears transitions whenever TopologyTransitionsEvaluated is not True, + // a reported value always reflects the current evaluation, never a stale one. + TopologyTransitionAvailableConditionType = "TopologyTransitionAvailable" +) + +// TopologyTransitionStatus reports availability of each type of topology transition and contains the +// status of any initiated transition. +// +kubebuilder:validation:MinProperties=1 +type TopologyTransitionStatus struct { + // conditions provides information on topology transition progress and the + // evaluation of supported transition types. The controller always reports both + // conditions once topologyTransitionStatus is set. + // + // Valid condition types are TopologyTransitionsEvaluated and + // TopologyTransitionCompleted. Both conditions must be present: the controller + // always reports each condition explicitly, using Unknown when a condition's + // state is not yet known, rather than omitting it. + // + // +kubebuilder:validation:MinItems=2 + // +kubebuilder:validation:MaxItems=2 + // +kubebuilder:validation:XValidation:rule="self.all(c, c.type in ['TopologyTransitionsEvaluated', 'TopologyTransitionCompleted'])",message="conditions may only contain TopologyTransitionsEvaluated and TopologyTransitionCompleted" + // +optional + // +listType=map + // +listMapKey=type + Conditions []metav1.Condition `json:"conditions,omitempty"` + + // transitions contains each supported transition type and its availability. + // It is optional. The controller clears this list whenever + // TopologyTransitionsEvaluated is not True, so its presence always reflects + // current, trustworthy results: an omitted list while TopologyTransitionsEvaluated + // is True means no supported transition options were found, and an omitted list + // otherwise means no transition options have been reported yet. + // + // Between one and eight transition options must be present when the list is set. + // This list reports transition options, not concurrent transitions. The topology + // controller determines which transition options are supported. + // +kubebuilder:validation:MinItems=1 + // +kubebuilder:validation:MaxItems=8 + // +optional + // +listType=atomic + Transitions []TopologyTransition `json:"transitions,omitempty"` +} + +type TopologyTransition struct { + // source is the control-plane and infrastructure topology this transition was + // evaluated from. It may differ from the current topology while status is + // being refreshed. External control planes cannot be a transition source. + // controlPlaneTopology is the topology of the control-plane nodes. Valid values + // are HighlyAvailable, HighlyAvailableArbiter, and SingleReplica. + // External is not valid: transitions cannot involve an externally hosted control plane. + // SingleReplica means a single instance of control-plane services is expected + // to meet cluster needs. + // HighlyAvailable means multiple instances are expected to provide redundancy. + // HighlyAvailableArbiter means two control-plane nodes and a smaller arbiter + // node to maintain quorum. See + // https://pkg.go.dev/github.com/openshift/api/config/v1#TopologyMode for topology definitions. + // infrastructureTopology is the topology of infrastructure services. Valid + // values are SingleReplica and HighlyAvailable. + // SingleReplica means operators expect a single instance of infrastructure + // services to meet cluster needs. + // HighlyAvailable means operators expect multiple instances of infrastructure + // services to provide redundancy. + // source is required. + // +required + Source TopologyState `json:"source,omitempty,omitzero"` + + // target is the control-plane and infrastructure topology this transition would + // move to. + // controlPlaneTopology is the topology of the control-plane nodes. Valid values + // are HighlyAvailable, HighlyAvailableArbiter, and SingleReplica. + // External is not valid: transitions cannot involve an externally hosted control plane. + // SingleReplica means a single instance of control-plane services is expected + // to meet cluster needs. + // HighlyAvailable means multiple instances are expected to provide redundancy. + // HighlyAvailableArbiter means two control-plane nodes and a smaller arbiter + // node to maintain quorum. See + // https://pkg.go.dev/github.com/openshift/api/config/v1#TopologyMode for topology definitions. + // infrastructureTopology is the topology of infrastructure services. Valid + // values are SingleReplica and HighlyAvailable. + // SingleReplica means operators expect a single instance of infrastructure + // services to meet cluster needs. + // HighlyAvailable means operators expect multiple instances of infrastructure + // services to provide redundancy. + // External control planes cannot be a transition target. + // target is required. + // +required + Target TopologyState `json:"target,omitempty,omitzero"` + + // evaluations contains the availability condition for this transition and + // conditions for the checks run against the cluster to determine availability. + // + // TopologyTransitionAvailable is required; other condition types report + // individual checks. Between one and 32 conditions must be present, allowing + // at most 31 individual checks in addition to the availability condition. + // The controller defines individual check types, reasons, and messages, and + // always reports each one explicitly, using Unknown when a check's result is + // not yet known. + // + // +kubebuilder:validation:MaxItems=32 + // +kubebuilder:validation:MinItems=1 + // +kubebuilder:validation:XValidation:rule="self.exists(c, c.type == 'TopologyTransitionAvailable')",message="evaluations must contain TopologyTransitionAvailable" + // +required + // +listType=map + // +listMapKey=type + Evaluations []metav1.Condition `json:"evaluations,omitempty"` +} diff --git a/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go b/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go index 66d465ba21..cf71d7a1d5 100644 --- a/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go +++ b/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go @@ -3820,6 +3820,7 @@ func (in *InfrastructureStatus) DeepCopyInto(out *InfrastructureStatus) { *out = new(PlatformStatus) (*in).DeepCopyInto(*out) } + in.TopologyTransitionStatus.DeepCopyInto(&out.TopologyTransitionStatus) return } @@ -6869,6 +6870,77 @@ func (in *TokenUserValidationRule) DeepCopy() *TokenUserValidationRule { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TopologyState) DeepCopyInto(out *TopologyState) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TopologyState. +func (in *TopologyState) DeepCopy() *TopologyState { + if in == nil { + return nil + } + out := new(TopologyState) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TopologyTransition) DeepCopyInto(out *TopologyTransition) { + *out = *in + out.Source = in.Source + out.Target = in.Target + if in.Evaluations != nil { + in, out := &in.Evaluations, &out.Evaluations + *out = make([]metav1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TopologyTransition. +func (in *TopologyTransition) DeepCopy() *TopologyTransition { + if in == nil { + return nil + } + out := new(TopologyTransition) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TopologyTransitionStatus) DeepCopyInto(out *TopologyTransitionStatus) { + *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]metav1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Transitions != nil { + in, out := &in.Transitions, &out.Transitions + *out = make([]TopologyTransition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TopologyTransitionStatus. +func (in *TopologyTransitionStatus) DeepCopy() *TopologyTransitionStatus { + if in == nil { + return nil + } + out := new(TopologyTransitionStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Update) DeepCopyInto(out *Update) { *out = *in diff --git a/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.model_name.go b/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.model_name.go index 19d821fd71..c10808e7a8 100644 --- a/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.model_name.go +++ b/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.model_name.go @@ -1460,6 +1460,21 @@ func (in TokenUserValidationRule) OpenAPIModelName() string { return "com.github.openshift.api.config.v1.TokenUserValidationRule" } +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in TopologyState) OpenAPIModelName() string { + return "com.github.openshift.api.config.v1.TopologyState" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in TopologyTransition) OpenAPIModelName() string { + return "com.github.openshift.api.config.v1.TopologyTransition" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in TopologyTransitionStatus) OpenAPIModelName() string { + return "com.github.openshift.api.config.v1.TopologyTransitionStatus" +} + // OpenAPIModelName returns the OpenAPI model name for this type. func (in Update) OpenAPIModelName() string { return "com.github.openshift.api.config.v1.Update" diff --git a/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go index 44ac35e95a..7fb77382ad 100644 --- a/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go +++ b/etcd/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go @@ -1871,10 +1871,11 @@ func (InfrastructureList) SwaggerDoc() map[string]string { } var map_InfrastructureSpec = map[string]string{ - "": "InfrastructureSpec contains settings that apply to the cluster infrastructure.", - "cloudConfig": "cloudConfig is a reference to a ConfigMap containing the cloud provider configuration file. This configuration file is used to configure the Kubernetes cloud provider integration when using the built-in cloud provider integration or the external cloud controller manager. The namespace for this config map is openshift-config.\n\ncloudConfig should only be consumed by the kube_cloud_config controller. The controller is responsible for using the user configuration in the spec for various platforms and combining that with the user provided ConfigMap in this field to create a stitched kube cloud config. The controller generates a ConfigMap `kube-cloud-config` in `openshift-config-managed` namespace with the kube cloud config is stored in `cloud.conf` key. All the clients are expected to use the generated ConfigMap only.", - "platformSpec": "platformSpec holds desired information specific to the underlying infrastructure provider.", - "controlPlaneTopology": "controlPlaneTopology expresses the desired topology configuration for control nodes.\n\nWhen status.controlPlaneTopology is 'SingleReplica' and spec.controlPlaneTopology is set to 'HighlyAvailable', a transition will be triggered to reconfigure the cluster from SingleReplica to HighlyAvailable.\n\nWhen left blank or status.controlPlaneTopology and spec.controlPlaneTopology are the same value, no changes are required and no transitions will be triggered.\n\nThis value may be set to match status.controlPlaneTopology regardless of the current value.", + "": "InfrastructureSpec contains settings that apply to the cluster infrastructure.", + "cloudConfig": "cloudConfig is a reference to a ConfigMap containing the cloud provider configuration file. This configuration file is used to configure the Kubernetes cloud provider integration when using the built-in cloud provider integration or the external cloud controller manager. The namespace for this config map is openshift-config.\n\ncloudConfig should only be consumed by the kube_cloud_config controller. The controller is responsible for using the user configuration in the spec for various platforms and combining that with the user provided ConfigMap in this field to create a stitched kube cloud config. The controller generates a ConfigMap `kube-cloud-config` in `openshift-config-managed` namespace with the kube cloud config is stored in `cloud.conf` key. All the clients are expected to use the generated ConfigMap only.", + "platformSpec": "platformSpec holds desired information specific to the underlying infrastructure provider.", + "controlPlaneTopology": "controlPlaneTopology expresses the desired topology configuration for control nodes.\n\nWhen status.controlPlaneTopology is 'SingleReplica' and spec.controlPlaneTopology is set to 'HighlyAvailable', a transition will be triggered to reconfigure the cluster from SingleReplica to HighlyAvailable.\n\nWhen left blank or status.controlPlaneTopology and spec.controlPlaneTopology are the same value, no changes are required and no transitions will be triggered.\n\nThis value may be set to match status.controlPlaneTopology regardless of the current value.", + "infrastructureTopology": "infrastructureTopology expresses the desired topology for infrastructure services that do not run on control plane nodes, indicating how infrastructure workloads are distributed across nodes.\n\nWhen omitted, no topology transition override has been expressed. Once populated, the field represents the desired topology state.\n\nWhen the value differs from status.infrastructureTopology, the cluster evaluates whether the requested transition can proceed. Not all transitions may be permitted.", } func (InfrastructureSpec) SwaggerDoc() map[string]string { @@ -1882,16 +1883,17 @@ func (InfrastructureSpec) SwaggerDoc() map[string]string { } var map_InfrastructureStatus = map[string]string{ - "": "InfrastructureStatus describes the infrastructure the cluster is leveraging.", - "infrastructureName": "infrastructureName uniquely identifies a cluster with a human friendly name. Once set it should not be changed. Must be of max length 27 and must have only alphanumeric or hyphen characters.", - "platform": "platform is the underlying infrastructure provider for the cluster.\n\nDeprecated: Use platformStatus.type instead.", - "platformStatus": "platformStatus holds status information specific to the underlying infrastructure provider.", - "etcdDiscoveryDomain": "etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery deprecated: as of 4.7, this field is no longer set or honored. It will be removed in a future release.", - "apiServerURL": "apiServerURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerURL can be used by components like the web console to tell users where to find the Kubernetes API.", - "apiServerInternalURI": "apiServerInternalURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerInternalURL can be used by components like kubelets, to contact the Kubernetes API server using the infrastructure provider rather than Kubernetes networking.", - "controlPlaneTopology": "controlPlaneTopology expresses the expectations for operands that normally run on control nodes. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation The 'External' mode indicates that the control plane is hosted externally to the cluster and that its components are not visible within the cluster. The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.", - "infrastructureTopology": "infrastructureTopology expresses the expectations for infrastructure services that do not run on control plane nodes, usually indicated by a node selector for a `role` value other than `master`. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation NOTE: External topology mode is not applicable for this field.", - "cpuPartitioning": "cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. Valid values are \"None\" and \"AllNodes\". When omitted, the default value is \"None\". The default value of \"None\" indicates that no nodes will be setup with CPU partitioning. The \"AllNodes\" value indicates that all nodes have been setup with CPU partitioning, and can then be further configured via the PerformanceProfile API.", + "": "InfrastructureStatus describes the infrastructure the cluster is leveraging.", + "infrastructureName": "infrastructureName uniquely identifies a cluster with a human friendly name. Once set it should not be changed. Must be of max length 27 and must have only alphanumeric or hyphen characters.", + "platform": "platform is the underlying infrastructure provider for the cluster.\n\nDeprecated: Use platformStatus.type instead.", + "platformStatus": "platformStatus holds status information specific to the underlying infrastructure provider.", + "etcdDiscoveryDomain": "etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery deprecated: as of 4.7, this field is no longer set or honored. It will be removed in a future release.", + "apiServerURL": "apiServerURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerURL can be used by components like the web console to tell users where to find the Kubernetes API.", + "apiServerInternalURI": "apiServerInternalURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerInternalURL can be used by components like kubelets, to contact the Kubernetes API server using the infrastructure provider rather than Kubernetes networking.", + "controlPlaneTopology": "controlPlaneTopology expresses the expectations for operands that normally run on control nodes. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation The 'External' mode indicates that the control plane is hosted externally to the cluster and that its components are not visible within the cluster. The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.", + "infrastructureTopology": "infrastructureTopology expresses the expectations for infrastructure services that do not run on control plane nodes, usually indicated by a node selector for a `role` value other than `master`. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation NOTE: External topology mode is not applicable for this field.", + "topologyTransitionStatus": "topologyTransitionStatus reports evaluations of supported topology transitions and the status of a requested transition, if any. It is optional and is omitted until the topology controller reports transition status. A transition is requested through spec.controlPlaneTopology. The controller reports completion only after both topologies reach that transition's target and post-transition checks pass; reaching the target topology alone is not completion.", + "cpuPartitioning": "cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. Valid values are \"None\" and \"AllNodes\". When omitted, the default value is \"None\". The default value of \"None\" indicates that no nodes will be setup with CPU partitioning. The \"AllNodes\" value indicates that all nodes have been setup with CPU partitioning, and can then be further configured via the PerformanceProfile API.", } func (InfrastructureStatus) SwaggerDoc() map[string]string { @@ -2271,6 +2273,36 @@ func (VSpherePlatformVCenterSpec) SwaggerDoc() map[string]string { return map_VSpherePlatformVCenterSpec } +var map_TopologyState = map[string]string{ + "": "TopologyState describes the control-plane and infrastructure topology at one end of a topology transition. The topology controller determines which transitions are supported. Currently, it supports only transitions that change both topologies from SingleReplica to HighlyAvailable. Representing a topology here does not enable a transition to it.", + "controlPlaneTopology": "controlPlaneTopology is the topology of the control-plane nodes. Valid values are HighlyAvailable, HighlyAvailableArbiter, and SingleReplica. External is not valid: transitions cannot involve an externally hosted control plane. SingleReplica means a single instance of control-plane services is expected to meet cluster needs. HighlyAvailable means multiple instances are expected to provide redundancy. HighlyAvailableArbiter means two control-plane nodes and a smaller arbiter node to maintain quorum. See https://pkg.go.dev/github.com/openshift/api/config/v1#TopologyMode for topology definitions. controlPlaneTopology is required.", + "infrastructureTopology": "infrastructureTopology is the topology of infrastructure services. Valid values are SingleReplica and HighlyAvailable. SingleReplica means operators expect a single instance of infrastructure services to meet cluster needs. HighlyAvailable means operators expect multiple instances of infrastructure services to provide redundancy. infrastructureTopology is required.", +} + +func (TopologyState) SwaggerDoc() map[string]string { + return map_TopologyState +} + +var map_TopologyTransition = map[string]string{ + "source": "source is the control-plane and infrastructure topology this transition was evaluated from. It may differ from the current topology while status is being refreshed. External control planes cannot be a transition source. controlPlaneTopology is the topology of the control-plane nodes. Valid values are HighlyAvailable, HighlyAvailableArbiter, and SingleReplica. External is not valid: transitions cannot involve an externally hosted control plane. SingleReplica means a single instance of control-plane services is expected to meet cluster needs. HighlyAvailable means multiple instances are expected to provide redundancy. HighlyAvailableArbiter means two control-plane nodes and a smaller arbiter node to maintain quorum. See https://pkg.go.dev/github.com/openshift/api/config/v1#TopologyMode for topology definitions. infrastructureTopology is the topology of infrastructure services. Valid values are SingleReplica and HighlyAvailable. SingleReplica means operators expect a single instance of infrastructure services to meet cluster needs. HighlyAvailable means operators expect multiple instances of infrastructure services to provide redundancy. source is required.", + "target": "target is the control-plane and infrastructure topology this transition would move to. controlPlaneTopology is the topology of the control-plane nodes. Valid values are HighlyAvailable, HighlyAvailableArbiter, and SingleReplica. External is not valid: transitions cannot involve an externally hosted control plane. SingleReplica means a single instance of control-plane services is expected to meet cluster needs. HighlyAvailable means multiple instances are expected to provide redundancy. HighlyAvailableArbiter means two control-plane nodes and a smaller arbiter node to maintain quorum. See https://pkg.go.dev/github.com/openshift/api/config/v1#TopologyMode for topology definitions. infrastructureTopology is the topology of infrastructure services. Valid values are SingleReplica and HighlyAvailable. SingleReplica means operators expect a single instance of infrastructure services to meet cluster needs. HighlyAvailable means operators expect multiple instances of infrastructure services to provide redundancy. External control planes cannot be a transition target. target is required.", + "evaluations": "evaluations contains the availability condition for this transition and conditions for the checks run against the cluster to determine availability.\n\nTopologyTransitionAvailable is required; other condition types report individual checks. Between one and 32 conditions must be present, allowing at most 31 individual checks in addition to the availability condition. The controller defines individual check types, reasons, and messages, and always reports each one explicitly, using Unknown when a check's result is not yet known.", +} + +func (TopologyTransition) SwaggerDoc() map[string]string { + return map_TopologyTransition +} + +var map_TopologyTransitionStatus = map[string]string{ + "": "TopologyTransitionStatus reports availability of each type of topology transition and contains the status of any initiated transition.", + "conditions": "conditions provides information on topology transition progress and the evaluation of supported transition types. The controller always reports both conditions once topologyTransitionStatus is set.\n\nValid condition types are TopologyTransitionsEvaluated and TopologyTransitionCompleted. Both conditions must be present: the controller always reports each condition explicitly, using Unknown when a condition's state is not yet known, rather than omitting it.", + "transitions": "transitions contains each supported transition type and its availability. It is optional. The controller clears this list whenever TopologyTransitionsEvaluated is not True, so its presence always reflects current, trustworthy results: an omitted list while TopologyTransitionsEvaluated is True means no supported transition options were found, and an omitted list otherwise means no transition options have been reported yet.\n\nBetween one and eight transition options must be present when the list is set. This list reports transition options, not concurrent transitions. The topology controller determines which transition options are supported.", +} + +func (TopologyTransitionStatus) SwaggerDoc() map[string]string { + return map_TopologyTransitionStatus +} + var map_AWSIngressSpec = map[string]string{ "": "AWSIngressSpec holds the desired state of the Ingress for Amazon Web Services infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "type allows user to set a load balancer type. When this field is set the default ingresscontroller will get created using the specified LBType. If this field is not set then the default ingress controller of LBType Classic will be created. Valid values are:\n\n* \"Classic\": A Classic Load Balancer that makes routing decisions at either\n the transport layer (TCP/SSL) or the application layer (HTTP/HTTPS). See\n the following for additional details:\n\n https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#clb\n\n* \"NLB\": A Network Load Balancer that makes routing decisions at the\n transport layer (TCP/SSL). See the following for additional details:\n\n https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#nlb", diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/register.go b/etcd/vendor/github.com/openshift/api/operator/v1/register.go index 5920c4fca7..7825af99f6 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/register.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/register.go @@ -70,6 +70,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ServiceCatalogAPIServerList{}, &ServiceCatalogControllerManager{}, &ServiceCatalogControllerManagerList{}, + &Ingress{}, + &IngressList{}, &IngressController{}, &IngressControllerList{}, &InsightsOperator{}, diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/types_console.go b/etcd/vendor/github.com/openshift/api/operator/v1/types_console.go index 35795b2b71..0e5d00382e 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/types_console.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/types_console.go @@ -35,6 +35,19 @@ type Console struct { // ConsoleSpec is the specification of the desired behavior of the Console. type ConsoleSpec struct { OperatorSpec `json:",inline"` + + // authProxy configures proxy settings for outbound connections made by + // Console's OIDC login clients, including discovery, JWKS retrieval, + // code exchange, and token refresh. When set, it replaces the cluster-wide + // proxy (proxy.config.openshift.io/cluster) entirely for these connections; + // individual fields are not inherited from the cluster-wide configuration. + // At least one of httpProxy or httpsProxy must be specified. + // When omitted, the cluster-wide proxy is used if configured; otherwise no + // proxy is used. Other Console clients retain their existing proxy settings. + // +openshift:enable:FeatureGate=AuthenticationComponentProxyExternalOIDC + // +optional + AuthProxy ConsoleAuthProxyConfig `json:"authProxy,omitzero"` + // customization is used to optionally provide a small set of // customization options to the web console. // +optional @@ -54,13 +67,90 @@ type ConsoleSpec struct { // +optional Route ConsoleConfigRoute `json:"route"` // plugins defines a list of enabled console plugin names. + // +listType=atomic // +optional Plugins []string `json:"plugins,omitempty"` // ingress allows to configure the alternative ingress for the console. // This field is intended for clusters without ingress capability, // where access to routes is not possible. // +optional - Ingress Ingress `json:"ingress"` + Ingress ConsoleIngress `json:"ingress"` +} + +// ConsoleAuthProxyConfig holds proxy configuration scoped to Console's OIDC login clients. +// At least one of httpProxy or httpsProxy must be specified. +// +kubebuilder:validation:MinProperties=1 +// +kubebuilder:validation:XValidation:rule="has(self.httpProxy) || has(self.httpsProxy)",message="at least one of httpProxy or httpsProxy must be specified" +type ConsoleAuthProxyConfig struct { + // httpProxy is the URL of the proxy for HTTP requests. + // Must be a valid URL with http or https scheme, a non-empty + // hostname, and no path, query parameters, or fragment. + // Userinfo (e.g. user:password@host) is allowed for proxy + // authentication. Maximum length is 2048 characters. + // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:MaxLength=2048 + // +kubebuilder:validation:XValidation:rule="isURL(self)",message="httpProxy must be a valid URL" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || url(self).getScheme() in ['http', 'https']",message="httpProxy must use http or https scheme" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || size(url(self).getHostname()) > 0",message="httpProxy must contain a hostname" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || url(self).getEscapedPath() == '' || url(self).getEscapedPath() == '/'",message="httpProxy must not contain a path" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || url(self).getQuery().size() == 0",message="httpProxy must not contain query parameters" + // +kubebuilder:validation:XValidation:rule="!self.matches('.*#.*')",message="httpProxy must not contain a fragment" + // +optional + HTTPProxy string `json:"httpProxy,omitempty"` + + // httpsProxy is the URL of the proxy for HTTPS requests. + // Must be a valid URL with http or https scheme, a non-empty + // hostname, and no path, query parameters, or fragment. + // Userinfo (e.g. user:password@host) is allowed for proxy + // authentication. Maximum length is 2048 characters. + // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:MaxLength=2048 + // +kubebuilder:validation:XValidation:rule="isURL(self)",message="httpsProxy must be a valid URL" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || url(self).getScheme() in ['http', 'https']",message="httpsProxy must use http or https scheme" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || size(url(self).getHostname()) > 0",message="httpsProxy must contain a hostname" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || url(self).getEscapedPath() == '' || url(self).getEscapedPath() == '/'",message="httpsProxy must not contain a path" + // +kubebuilder:validation:XValidation:rule="!isURL(self) || url(self).getQuery().size() == 0",message="httpsProxy must not contain query parameters" + // +kubebuilder:validation:XValidation:rule="!self.matches('.*#.*')",message="httpsProxy must not contain a fragment" + // +optional + HTTPSProxy string `json:"httpsProxy,omitempty"` + + // noProxy is a list of hostnames and/or CIDRs and/or IPs for which + // the proxy should not be used. Must contain at least one entry + // when set. Each entry must be between 1 and 253 characters long + // and at most 64 entries are allowed. Duplicate + // entries are not permitted. Entries that are not valid hostnames, + // CIDRs, or IPs are silently ignored. Cluster-internal defaults + // (.cluster.local, .svc, 127.0.0.1, localhost) are always appended + // automatically and do not need to be included. + // +listType=set + // +kubebuilder:validation:MinItems=1 + // +kubebuilder:validation:MaxItems=64 + // +kubebuilder:validation:items:MinLength=1 + // +kubebuilder:validation:items:MaxLength=253 + // +optional + NoProxy []string `json:"noProxy,omitempty"` + + // trustedCA is a reference to a ConfigMap in the openshift-config + // namespace containing a CA certificate bundle under the key + // "ca-bundle.crt". This bundle is appended to the system trust store + // used by Console's OIDC login clients for proxy TLS connections. + // When omitted, only the system trust store is used. + // +optional + TrustedCA ConsoleAuthProxyTrustedCAConfigMapReference `json:"trustedCA,omitzero"` +} + +// ConsoleAuthProxyTrustedCAConfigMapReference references a ConfigMap in the +// openshift-config namespace. +type ConsoleAuthProxyTrustedCAConfigMapReference struct { + // name is the metadata.name of the referenced ConfigMap. + // Must be a valid DNS subdomain name (RFC 1123): at most 253 + // characters, only lowercase alphanumeric characters, '-' or + // '.', starting and ending with an alphanumeric character. + // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:MaxLength=253 + // +kubebuilder:validation:XValidation:rule="!format.dns1123Subdomain().validate(self).hasValue()",message="name must be a valid DNS subdomain name: contain no more than 253 characters, contain only lowercase alphanumeric characters, '-' or '.', and start and end with an alphanumeric character" + // +required + Name string `json:"name,omitempty"` } // ConsoleConfigRoute holds information on external route access to console. @@ -344,6 +434,7 @@ type ConsoleCustomization struct { type ProjectAccess struct { // availableClusterRoles is the list of ClusterRole names that are assignable to users // through the project access tab. + // +listType=atomic // +optional AvailableClusterRoles []string `json:"availableClusterRoles,omitempty"` } @@ -390,6 +481,7 @@ type DeveloperConsoleCatalogTypes struct { // DeveloperConsoleCatalogCustomization allow cluster admin to configure developer catalog. type DeveloperConsoleCatalogCustomization struct { // categories which are shown in the developer catalog. + // +listType=atomic // +optional Categories []DeveloperConsoleCatalogCategory `json:"categories,omitempty"` // types allows enabling or disabling of sub-catalog types that user can see in the Developer catalog. @@ -414,6 +506,7 @@ type DeveloperConsoleCatalogCategoryMeta struct { Label string `json:"label"` // tags is a list of strings that will match the category. A selected category // show all items which has at least one overlapping tag between category and item. + // +listType=atomic // +optional Tags []string `json:"tags,omitempty"` } @@ -423,6 +516,7 @@ type DeveloperConsoleCatalogCategory struct { // defines top level category ID, label and filter tags. DeveloperConsoleCatalogCategoryMeta `json:",inline"` // subcategories defines a list of child categories. + // +listType=atomic // +optional Subcategories []DeveloperConsoleCatalogCategoryMeta `json:"subcategories,omitempty"` } @@ -430,6 +524,7 @@ type DeveloperConsoleCatalogCategory struct { // QuickStarts allow cluster admins to customize available ConsoleQuickStart resources. type QuickStarts struct { // disabled is a list of ConsoleQuickStart resource names that are not shown to users. + // +listType=atomic // +optional Disabled []string `json:"disabled,omitempty"` } @@ -439,6 +534,7 @@ type AddPage struct { // disabledActions is a list of actions that are not shown to users. // Each action in the list is represented by its ID. // +kubebuilder:validation:MinItems=1 + // +listType=atomic // +optional DisabledActions []string `json:"disabledActions,omitempty"` } @@ -460,9 +556,11 @@ const ( // +kubebuilder:validation:MinProperties:=1 type ResourceAttributesAccessReview struct { // required defines a list of permission checks. The perspective will only be shown when all checks are successful. When omitted, the access review is skipped and the perspective will not be shown unless it is required to do so based on the configuration of the missing access review list. + // +listType=atomic // +optional Required []authorizationv1.ResourceAttributes `json:"required"` // missing defines a list of permission checks. The perspective will only be shown when at least one check fails. When omitted, the access review is skipped and the perspective will not be shown unless it is required to do so based on the configuration of the required access review list. + // +listType=atomic // +optional Missing []authorizationv1.ResourceAttributes `json:"missing"` } @@ -498,6 +596,7 @@ type Perspective struct { // The console will also provide a configuration UI and a YAML snippet that will list the available resources that can be pinned to the navigation. // Incorrect or unknown resources will be ignored. // +kubebuilder:validation:MaxItems=100 + // +listType=atomic // +optional PinnedResources *[]PinnedResourceReference `json:"pinnedResources,omitempty"` } @@ -559,7 +658,7 @@ const ( ) // Ingress allows cluster admin to configure alternative ingress for the console. -type Ingress struct { +type ConsoleIngress struct { // consoleURL is a URL to be used as the base console address. // If not specified, the console route hostname will be used. // This field is required for clusters without ingress capability, diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/types_ingress.go b/etcd/vendor/github.com/openshift/api/operator/v1/types_ingress.go new file mode 100644 index 0000000000..a031b4e57e --- /dev/null +++ b/etcd/vendor/github.com/openshift/api/operator/v1/types_ingress.go @@ -0,0 +1,146 @@ +package v1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// +genclient +// +genclient:nonNamespaced +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// Ingress contains configuration options specific to the Ingress Operator itself, +// including how it manages Gateway API integration. +// +// Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). +// +openshift:compatibility-gen:level=1 +// +openshift:file-pattern=cvoRunLevel=0000_50,operatorName=ingress,operatorOrdering=02 +// +kubebuilder:object:root=true +// +kubebuilder:resource:path=ingresses,scope=Cluster +// +kubebuilder:subresource:status +// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2890 +// +openshift:capability=Ingress +// +openshift:enable:FeatureGate=GatewayAPIManagementMode +// +kubebuilder:validation:XValidation:rule="self.metadata.name == 'cluster'",message="Ingress is a singleton; the .metadata.name field must be 'cluster'" +type Ingress struct { + metav1.TypeMeta `json:",inline"` + + // metadata is the standard object's metadata. + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + // +required + metav1.ObjectMeta `json:"metadata"` + + // spec holds user settable values for configuration. + // +required + Spec IngressSpec `json:"spec,omitzero"` + + // status holds observed values from the cluster. + // +optional + Status IngressStatus `json:"status,omitzero"` +} + +// IngressSpec is the specification of the desired behavior of the Ingress Operator. +// +kubebuilder:validation:MinProperties=1 +type IngressSpec struct { + // gatewayAPI holds configuration for Gateway API integration, including how the + // ingress operator manages Gateway API CRDs, the OpenShift Gateway API + // implementation, and its Gateway API controllers. + // + // +optional + GatewayAPI GatewayAPIIngressConfig `json:"gatewayAPI,omitzero"` +} + +// IngressStatus defines the observed status of the Ingress Operator. +// +kubebuilder:validation:MinProperties=1 +// +kubebuilder:validation:XValidation:rule="!has(oldSelf.observedGeneration) || (has(self.observedGeneration) && self.observedGeneration >= oldSelf.observedGeneration)",message="observedGeneration must remain set and only increase once set" +type IngressStatus struct { + // conditions is a list of conditions and their status. + // + // Gateway API CRD management conditions are reported here with the "GatewayAPI" prefix: + // + // * "GatewayAPICRDsManaged" indicates whether the ingress operator is actively + // managing Gateway API CRDs. + // * "GatewayAPICRDsPresent" indicates whether Gateway API CRDs exist on the + // cluster. + // * "GatewayAPICRDsCompliant" indicates whether the installed CRDs match the + // version expected by this ingress operator release. + // + // +listType=map + // +listMapKey=type + // +kubebuilder:validation:MinItems=1 + // +kubebuilder:validation:MaxItems=32 + // +optional + Conditions []metav1.Condition `json:"conditions,omitempty"` + + // observedGeneration represents the most recent generation observed by the operator and specifies the version of + // the spec field currently being synced. + // + // When omitted, the operator has not yet observed the resource. + // +optional + // +kubebuilder:validation:Minimum=1 + ObservedGeneration int64 `json:"observedGeneration,omitempty"` +} + +// GatewayAPIIngressConfig holds configuration for Gateway API integration in the +// Cluster Ingress Operator. +// +kubebuilder:validation:MinProperties=1 +type GatewayAPIIngressConfig struct { + // managementMode specifies how the Cluster Ingress Operator manages Gateway API + // Custom Resource Definitions (CRDs), the OpenShift Gateway API implementation, + // and its Gateway API controllers. + // + // Allowed values are "Managed" and "Unmanaged". + // + // When omitted or set to "Managed", the ingress operator installs, owns, and + // upgrades the Gateway API CRDs, protects them with a Validating Admission + // Policy, and deploys the OpenShift Gateway API implementation and its Gateway + // API controllers. + // + // When set to "Unmanaged", the ingress operator does not install or manage + // Gateway API CRDs and does not deploy the OpenShift Gateway API implementation + // or its Gateway API controllers. The cluster administrator or a third-party + // product is responsible for providing their own CRDs and Gateway controller. + // The ingress operator reports observational status only. + // + // +optional + ManagementMode GatewayAPIManagementMode `json:"managementMode,omitempty"` +} + +// GatewayAPIManagementMode describes how the Cluster Ingress Operator manages +// Gateway API Custom Resource Definitions. +// +kubebuilder:validation:Enum=Managed;Unmanaged +type GatewayAPIManagementMode string + +const ( + // GatewayAPIManagementModeManaged means the ingress operator installs, owns, + // protects (via a Validating Admission Policy), and upgrades the Gateway API + // CRDs, deploys the OpenShift Gateway API implementation, and runs its Gateway + // API controllers. This is the default mode and the only fully supported + // configuration. + GatewayAPIManagementModeManaged GatewayAPIManagementMode = "Managed" + + // GatewayAPIManagementModeUnmanaged means the ingress operator does not + // install or manage Gateway API CRDs, does not deploy the OpenShift Gateway + // API implementation, and does not run its Gateway API controllers. The + // cluster administrator or a third-party product is responsible for bringing + // their own CRDs and Gateway controller. The ingress operator reports + // observational status only. + GatewayAPIManagementModeUnmanaged GatewayAPIManagementMode = "Unmanaged" +) + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// IngressList is a collection of Ingresses. +// +// Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). +// +openshift:compatibility-gen:level=1 +type IngressList struct { + metav1.TypeMeta `json:",inline"` + + // metadata is the standard list's metadata. + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + metav1.ListMeta `json:"metadata"` + + // items is a list of Ingresses. + // +optional + Items []Ingress `json:"items,omitempty"` +} diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/types_ingresscontroller.go b/etcd/vendor/github.com/openshift/api/operator/v1/types_ingresscontroller.go index 468464730e..151c88f7f8 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/types_ingresscontroller.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/types_ingresscontroller.go @@ -389,13 +389,20 @@ type IngressControllerSpec struct { // haproxyVersion specifies the HAProxy version to use for this // IngressController. // - // OpenShift 5.1 continues with HAProxy 3.2 (same minor version introduced - // in OpenShift 5.0) and does not introduce a new HAProxy version. + // OpenShift 5.1 uses HAProxy 3.2 as its default version and supports + // HAProxy 3.4 as an explicit, non-default opt-in. // // Valid values for OpenShift 5.1: // - Unset (default): Uses HAProxy 3.2 (the default for OpenShift 5.1) // - "3.2": Uses the latest HAProxy 3.2.z available for this OpenShift // release and pins the minor version. + // - "3.4": Uses the latest HAProxy 3.4.z available for this OpenShift + // release. This is an explicit opt-in; HAProxy 3.4 is not the default. + // + // Planned lifecycle for later OpenShift releases: + // - OpenShift 5.2 plans to make HAProxy 3.4 the default when this field is + // unset, while continuing to support "3.2" as an explicit selection. + // - OpenShift 5.3 plans to retire support for selecting HAProxy 3.2. // // Note: HAProxy 2.8 support has been dropped in OpenShift 5.1. Upgrading // from OpenShift 5.0 with haproxyVersion set to "2.8" is blocked. @@ -2329,7 +2336,13 @@ type IngressControllerStatus struct { // been resolved by the operator or the feature is not enabled for this cluster. // // Examples for OpenShift 5.1: - // - "3.2": Using HAProxy 3.2 + // - "3.2": Using the default HAProxy 3.2 + // - "3.4": Using the explicitly selected, non-default HAProxy 3.4 + // + // Planned lifecycle for later OpenShift releases: + // - OpenShift 5.2 plans to make HAProxy 3.4 the default while keeping + // HAProxy 3.2 selectable. + // - OpenShift 5.3 plans to retire HAProxy 3.2. // // +optional // +openshift:enable:FeatureGate=IngressControllerMultipleHAProxyVersions @@ -2407,10 +2420,13 @@ const ( // format. The allowed values are constrained by enum validation and vary by // OpenShift release. // -// +kubebuilder:validation:Enum="3.2" +// +kubebuilder:validation:Enum="3.2";"3.4" type HAProxyVersion string const ( // HAProxyVersion32 represents HAProxy 3.2, introduced in OpenShift 5.0. HAProxyVersion32 HAProxyVersion = "3.2" + + // HAProxyVersion34 represents HAProxy 3.4, available as a non-default option in OpenShift 5.1. + HAProxyVersion34 HAProxyVersion = "3.4" ) diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go b/etcd/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go index 51a981b716..637a7888db 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go @@ -142,6 +142,7 @@ const ( // KMSPreflightResult contains the outcome of a preflight validation. // // +openshift:compatibility-gen:level=1 +// +kubebuilder:validation:XValidation:rule="self.status != 'Succeeded' || has(self.remoteKeyID)",message="remoteKeyID is required when status is Succeeded" type KMSPreflightResult struct { // status indicates the outcome of the preflight check. // Succeeded means the KMS plugin responded to Status, Encrypt, and @@ -163,9 +164,12 @@ type KMSPreflightResult struct { // remoteKeyID is the remote key encryption key identifier from KMS v2 // StatusResponse.key_id. This is not a cryptographic key, but a unique // representation of the remote key used to encrypt data. - // The value must be between 1 and 1024 characters. + // When omitted, no remote key identifier is available. This is expected + // when status is Failed, for example when the KMS provider could not be + // reached. When status is Succeeded, remoteKeyID is required. + // When set, the value must be between 1 and 1024 characters. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:MaxLength=1024 - // +required + // +optional RemoteKeyID string `json:"remoteKeyID,omitempty"` } diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go b/etcd/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go index 112eb85dec..e016d654e8 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go @@ -22,9 +22,9 @@ import ( // +kubebuilder:validation:XValidation:rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?spec.managedBootImages.machineManagers.hasValue()) || !self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'machine.openshift.io') || self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'machine.openshift.io' && m.selection.mode == 'All') : true",message="when skew enforcement is in Automatic mode, any MachineAPI MachineSet MachineManager must use selection mode 'All'" // +kubebuilder:validation:XValidation:rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinesets' && m.apiGroup == 'machine.openshift.io'): true",message="when skew enforcement is in Automatic mode, managedBootImagesStatus must contain a MachineManager opting in all MachineAPI MachineSets" // +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?spec.managedBootImages.machineManagers.hasValue()) || !self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io') || self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io' && m.selection.mode == 'All') : true",message="when skew enforcement is in Automatic mode, any CAPI MachineSet MachineManager must use selection mode 'All'" -// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io'): true",message="when skew enforcement is in Automatic mode, managedBootImagesStatus must contain a MachineManager opting in all CAPI MachineSets" +// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || !self.status.managedBootImagesStatus.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io') || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io'): true",message="when skew enforcement is in Automatic mode, any CAPI MachineSet MachineManager in managedBootImagesStatus must use selection mode 'All'" // +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?spec.managedBootImages.machineManagers.hasValue()) || !self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinedeployments' && m.apiGroup == 'cluster.x-k8s.io') || self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinedeployments' && m.selection.mode == 'All') : true",message="when skew enforcement is in Automatic mode, any CAPI MachineDeployment MachineManager must use selection mode 'All'" -// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinedeployments'): true",message="when skew enforcement is in Automatic mode, managedBootImagesStatus must contain a MachineManager opting in all CAPI MachineDeployments" +// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || !self.status.managedBootImagesStatus.machineManagers.exists(m, m.resource == 'machinedeployments') || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinedeployments'): true",message="when skew enforcement is in Automatic mode, any CAPI MachineDeployment MachineManager in managedBootImagesStatus must use selection mode 'All'" type MachineConfiguration struct { metav1.TypeMeta `json:",inline"` diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go index 2d41027451..be972585d9 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go @@ -1055,6 +1055,44 @@ func (in *Console) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConsoleAuthProxyConfig) DeepCopyInto(out *ConsoleAuthProxyConfig) { + *out = *in + if in.NoProxy != nil { + in, out := &in.NoProxy, &out.NoProxy + *out = make([]string, len(*in)) + copy(*out, *in) + } + out.TrustedCA = in.TrustedCA + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleAuthProxyConfig. +func (in *ConsoleAuthProxyConfig) DeepCopy() *ConsoleAuthProxyConfig { + if in == nil { + return nil + } + out := new(ConsoleAuthProxyConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConsoleAuthProxyTrustedCAConfigMapReference) DeepCopyInto(out *ConsoleAuthProxyTrustedCAConfigMapReference) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleAuthProxyTrustedCAConfigMapReference. +func (in *ConsoleAuthProxyTrustedCAConfigMapReference) DeepCopy() *ConsoleAuthProxyTrustedCAConfigMapReference { + if in == nil { + return nil + } + out := new(ConsoleAuthProxyTrustedCAConfigMapReference) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConsoleConfigRoute) DeepCopyInto(out *ConsoleConfigRoute) { *out = *in @@ -1112,6 +1150,22 @@ func (in *ConsoleCustomization) DeepCopy() *ConsoleCustomization { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConsoleIngress) DeepCopyInto(out *ConsoleIngress) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleIngress. +func (in *ConsoleIngress) DeepCopy() *ConsoleIngress { + if in == nil { + return nil + } + out := new(ConsoleIngress) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConsoleList) DeepCopyInto(out *ConsoleList) { *out = *in @@ -1170,6 +1224,7 @@ func (in *ConsoleProviders) DeepCopy() *ConsoleProviders { func (in *ConsoleSpec) DeepCopyInto(out *ConsoleSpec) { *out = *in in.OperatorSpec.DeepCopyInto(&out.OperatorSpec) + in.AuthProxy.DeepCopyInto(&out.AuthProxy) in.Customization.DeepCopyInto(&out.Customization) in.Providers.DeepCopyInto(&out.Providers) out.Route = in.Route @@ -1861,6 +1916,22 @@ func (in *GCPLoadBalancerParameters) DeepCopy() *GCPLoadBalancerParameters { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *GatewayAPIIngressConfig) DeepCopyInto(out *GatewayAPIIngressConfig) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GatewayAPIIngressConfig. +func (in *GatewayAPIIngressConfig) DeepCopy() *GatewayAPIIngressConfig { + if in == nil { + return nil + } + out := new(GatewayAPIIngressConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GatewayConfig) DeepCopyInto(out *GatewayConfig) { *out = *in @@ -2201,6 +2272,10 @@ func (in *IPv6OVNKubernetesConfig) DeepCopy() *IPv6OVNKubernetesConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Ingress) DeepCopyInto(out *Ingress) { *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + in.Status.DeepCopyInto(&out.Status) return } @@ -2214,6 +2289,14 @@ func (in *Ingress) DeepCopy() *Ingress { return out } +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Ingress) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IngressController) DeepCopyInto(out *IngressController) { *out = *in @@ -2670,6 +2753,79 @@ func (in *IngressControllerTuningOptions) DeepCopy() *IngressControllerTuningOpt return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IngressList) DeepCopyInto(out *IngressList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Ingress, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressList. +func (in *IngressList) DeepCopy() *IngressList { + if in == nil { + return nil + } + out := new(IngressList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *IngressList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IngressSpec) DeepCopyInto(out *IngressSpec) { + *out = *in + out.GatewayAPI = in.GatewayAPI + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressSpec. +func (in *IngressSpec) DeepCopy() *IngressSpec { + if in == nil { + return nil + } + out := new(IngressSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IngressStatus) DeepCopyInto(out *IngressStatus) { + *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]metav1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressStatus. +func (in *IngressStatus) DeepCopy() *IngressStatus { + if in == nil { + return nil + } + out := new(IngressStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *InsightsOperator) DeepCopyInto(out *InsightsOperator) { *out = *in diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml index 7dd0b8f1b6..a5750a18bb 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml +++ b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml @@ -114,7 +114,8 @@ consoles.operator.openshift.io: CRDName: consoles.operator.openshift.io Capability: "" Category: "" - FeatureGates: [] + FeatureGates: + - AuthenticationComponentProxyExternalOIDC FilenameOperatorName: console FilenameOperatorOrdering: "01" FilenameRunLevel: "0000_50" @@ -172,6 +173,29 @@ etcds.operator.openshift.io: TopLevelFeatureGates: [] Version: v1 +ingresses.operator.openshift.io: + Annotations: {} + ApprovedPRNumber: https://github.com/openshift/api/pull/2890 + CRDName: ingresses.operator.openshift.io + Capability: Ingress + Category: "" + FeatureGates: + - GatewayAPIManagementMode + FilenameOperatorName: ingress + FilenameOperatorOrdering: "02" + FilenameRunLevel: "0000_50" + GroupName: operator.openshift.io + HasStatus: true + KindName: Ingress + Labels: {} + PluralName: ingresses + PrinterColumns: [] + Scope: Cluster + ShortNames: null + TopLevelFeatureGates: + - GatewayAPIManagementMode + Version: v1 + ingresscontrollers.operator.openshift.io: Annotations: {} ApprovedPRNumber: https://github.com/openshift/api/pull/616 diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go index 13ab0c5f6f..37218e6daf 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go @@ -240,6 +240,16 @@ func (in Console) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.Console" } +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ConsoleAuthProxyConfig) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.ConsoleAuthProxyConfig" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ConsoleAuthProxyTrustedCAConfigMapReference) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.ConsoleAuthProxyTrustedCAConfigMapReference" +} + // OpenAPIModelName returns the OpenAPI model name for this type. func (in ConsoleConfigRoute) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.ConsoleConfigRoute" @@ -250,6 +260,11 @@ func (in ConsoleCustomization) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.ConsoleCustomization" } +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ConsoleIngress) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.ConsoleIngress" +} + // OpenAPIModelName returns the OpenAPI model name for this type. func (in ConsoleList) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.ConsoleList" @@ -410,6 +425,11 @@ func (in GCPLoadBalancerParameters) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.GCPLoadBalancerParameters" } +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in GatewayAPIIngressConfig) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.GatewayAPIIngressConfig" +} + // OpenAPIModelName returns the OpenAPI model name for this type. func (in GatewayConfig) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.GatewayConfig" @@ -585,6 +605,21 @@ func (in IngressControllerTuningOptions) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.IngressControllerTuningOptions" } +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in IngressList) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.IngressList" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in IngressSpec) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.IngressSpec" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in IngressStatus) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.IngressStatus" +} + // OpenAPIModelName returns the OpenAPI model name for this type. func (in InsightsOperator) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.InsightsOperator" diff --git a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go index 891d75adc2..44f1a292c4 100644 --- a/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go +++ b/etcd/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go @@ -277,6 +277,27 @@ func (Console) SwaggerDoc() map[string]string { return map_Console } +var map_ConsoleAuthProxyConfig = map[string]string{ + "": "ConsoleAuthProxyConfig holds proxy configuration scoped to Console's OIDC login clients. At least one of httpProxy or httpsProxy must be specified.", + "httpProxy": "httpProxy is the URL of the proxy for HTTP requests. Must be a valid URL with http or https scheme, a non-empty hostname, and no path, query parameters, or fragment. Userinfo (e.g. user:password@host) is allowed for proxy authentication. Maximum length is 2048 characters.", + "httpsProxy": "httpsProxy is the URL of the proxy for HTTPS requests. Must be a valid URL with http or https scheme, a non-empty hostname, and no path, query parameters, or fragment. Userinfo (e.g. user:password@host) is allowed for proxy authentication. Maximum length is 2048 characters.", + "noProxy": "noProxy is a list of hostnames and/or CIDRs and/or IPs for which the proxy should not be used. Must contain at least one entry when set. Each entry must be between 1 and 253 characters long and at most 64 entries are allowed. Duplicate entries are not permitted. Entries that are not valid hostnames, CIDRs, or IPs are silently ignored. Cluster-internal defaults (.cluster.local, .svc, 127.0.0.1, localhost) are always appended automatically and do not need to be included.", + "trustedCA": "trustedCA is a reference to a ConfigMap in the openshift-config namespace containing a CA certificate bundle under the key \"ca-bundle.crt\". This bundle is appended to the system trust store used by Console's OIDC login clients for proxy TLS connections. When omitted, only the system trust store is used.", +} + +func (ConsoleAuthProxyConfig) SwaggerDoc() map[string]string { + return map_ConsoleAuthProxyConfig +} + +var map_ConsoleAuthProxyTrustedCAConfigMapReference = map[string]string{ + "": "ConsoleAuthProxyTrustedCAConfigMapReference references a ConfigMap in the openshift-config namespace.", + "name": "name is the metadata.name of the referenced ConfigMap. Must be a valid DNS subdomain name (RFC 1123): at most 253 characters, only lowercase alphanumeric characters, '-' or '.', starting and ending with an alphanumeric character.", +} + +func (ConsoleAuthProxyTrustedCAConfigMapReference) SwaggerDoc() map[string]string { + return map_ConsoleAuthProxyTrustedCAConfigMapReference +} + var map_ConsoleConfigRoute = map[string]string{ "": "ConsoleConfigRoute holds information on external route access to console. DEPRECATED", "hostname": "hostname is the desired custom domain under which console will be available.", @@ -306,6 +327,16 @@ func (ConsoleCustomization) SwaggerDoc() map[string]string { return map_ConsoleCustomization } +var map_ConsoleIngress = map[string]string{ + "": "Ingress allows cluster admin to configure alternative ingress for the console.", + "consoleURL": "consoleURL is a URL to be used as the base console address. If not specified, the console route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. Make sure that appropriate ingress is set up at this URL. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", + "clientDownloadsURL": "clientDownloadsURL is a URL to be used as the address to download client binaries. If not specified, the downloads route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", +} + +func (ConsoleIngress) SwaggerDoc() map[string]string { + return map_ConsoleIngress +} + var map_ConsoleList = map[string]string{ "": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "metadata": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", @@ -326,6 +357,7 @@ func (ConsoleProviders) SwaggerDoc() map[string]string { var map_ConsoleSpec = map[string]string{ "": "ConsoleSpec is the specification of the desired behavior of the Console.", + "authProxy": "authProxy configures proxy settings for outbound connections made by Console's OIDC login clients, including discovery, JWKS retrieval, code exchange, and token refresh. When set, it replaces the cluster-wide proxy (proxy.config.openshift.io/cluster) entirely for these connections; individual fields are not inherited from the cluster-wide configuration. At least one of httpProxy or httpsProxy must be specified. When omitted, the cluster-wide proxy is used if configured; otherwise no proxy is used. Other Console clients retain their existing proxy settings.", "customization": "customization is used to optionally provide a small set of customization options to the web console.", "providers": "providers contains configuration for using specific service providers.", "route": "route contains hostname and secret reference that contains the serving certificate. If a custom route is specified, a new route will be created with the provided hostname, under which console will be available. In case of custom hostname uses the default routing suffix of the cluster, the Secret specification for a serving certificate will not be needed. In case of custom hostname points to an arbitrary domain, manual DNS configurations steps are necessary. The default console route will be maintained to reserve the default hostname for console if the custom route is removed. If not specified, default route will be used. DEPRECATED", @@ -396,16 +428,6 @@ func (FileReferenceSource) SwaggerDoc() map[string]string { return map_FileReferenceSource } -var map_Ingress = map[string]string{ - "": "Ingress allows cluster admin to configure alternative ingress for the console.", - "consoleURL": "consoleURL is a URL to be used as the base console address. If not specified, the console route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. Make sure that appropriate ingress is set up at this URL. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", - "clientDownloadsURL": "clientDownloadsURL is a URL to be used as the address to download client binaries. If not specified, the downloads route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", -} - -func (Ingress) SwaggerDoc() map[string]string { - return map_Ingress -} - var map_Logo = map[string]string{ "": "Logo defines a configuration based on theme modes for the console UI logo.", "type": "type specifies the type of the logo for the console UI. It determines whether the logo is for the masthead or favicon. type is a required field that allows values of Masthead and Favicon. When set to \"Masthead\", the logo will be used in the masthead and about modal of the console UI. When set to \"Favicon\", the logo will be used as the favicon of the console UI.", @@ -895,6 +917,55 @@ func (EtcdSpec) SwaggerDoc() map[string]string { return map_EtcdSpec } +var map_GatewayAPIIngressConfig = map[string]string{ + "": "GatewayAPIIngressConfig holds configuration for Gateway API integration in the Cluster Ingress Operator.", + "managementMode": "managementMode specifies how the Cluster Ingress Operator manages Gateway API Custom Resource Definitions (CRDs), the OpenShift Gateway API implementation, and its Gateway API controllers.\n\nAllowed values are \"Managed\" and \"Unmanaged\".\n\nWhen omitted or set to \"Managed\", the ingress operator installs, owns, and upgrades the Gateway API CRDs, protects them with a Validating Admission Policy, and deploys the OpenShift Gateway API implementation and its Gateway API controllers.\n\nWhen set to \"Unmanaged\", the ingress operator does not install or manage Gateway API CRDs and does not deploy the OpenShift Gateway API implementation or its Gateway API controllers. The cluster administrator or a third-party product is responsible for providing their own CRDs and Gateway controller. The ingress operator reports observational status only.", +} + +func (GatewayAPIIngressConfig) SwaggerDoc() map[string]string { + return map_GatewayAPIIngressConfig +} + +var map_Ingress = map[string]string{ + "": "Ingress contains configuration options specific to the Ingress Operator itself, including how it manages Gateway API integration.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "spec": "spec holds user settable values for configuration.", + "status": "status holds observed values from the cluster.", +} + +func (Ingress) SwaggerDoc() map[string]string { + return map_Ingress +} + +var map_IngressList = map[string]string{ + "": "IngressList is a collection of Ingresses.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "metadata": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "items": "items is a list of Ingresses.", +} + +func (IngressList) SwaggerDoc() map[string]string { + return map_IngressList +} + +var map_IngressSpec = map[string]string{ + "": "IngressSpec is the specification of the desired behavior of the Ingress Operator.", + "gatewayAPI": "gatewayAPI holds configuration for Gateway API integration, including how the ingress operator manages Gateway API CRDs, the OpenShift Gateway API implementation, and its Gateway API controllers.", +} + +func (IngressSpec) SwaggerDoc() map[string]string { + return map_IngressSpec +} + +var map_IngressStatus = map[string]string{ + "": "IngressStatus defines the observed status of the Ingress Operator.", + "conditions": "conditions is a list of conditions and their status.\n\nGateway API CRD management conditions are reported here with the \"GatewayAPI\" prefix:\n\n* \"GatewayAPICRDsManaged\" indicates whether the ingress operator is actively\n managing Gateway API CRDs.\n* \"GatewayAPICRDsPresent\" indicates whether Gateway API CRDs exist on the\n cluster.\n* \"GatewayAPICRDsCompliant\" indicates whether the installed CRDs match the\n version expected by this ingress operator release.", + "observedGeneration": "observedGeneration represents the most recent generation observed by the operator and specifies the version of the spec field currently being synced.\n\nWhen omitted, the operator has not yet observed the resource.", +} + +func (IngressStatus) SwaggerDoc() map[string]string { + return map_IngressStatus +} + var map_AWSClassicLoadBalancerParameters = map[string]string{ "": "AWSClassicLoadBalancerParameters holds configuration parameters for an AWS Classic load balancer.", "connectionIdleTimeout": "connectionIdleTimeout specifies the maximum time period that a connection may be idle before the load balancer closes the connection. The value must be parseable as a time duration value; see . A nil or zero value means no opinion, in which case a default value is used. The default value for this field is 60s. This default is subject to change.", @@ -1174,7 +1245,7 @@ var map_IngressControllerSpec = map[string]string{ "httpCompression": "httpCompression defines a policy for HTTP traffic compression. By default, there is no HTTP compression.", "idleConnectionTerminationPolicy": "idleConnectionTerminationPolicy maps directly to HAProxy's idle-close-on-response option and controls whether HAProxy keeps idle frontend connections open during a soft stop (router reload).\n\nAllowed values for this field are \"Immediate\" and \"Deferred\". The default value is \"Immediate\".\n\nWhen set to \"Immediate\", idle connections are closed immediately during router reloads. This ensures immediate propagation of route changes but may impact clients sensitive to connection resets.\n\nWhen set to \"Deferred\", HAProxy will maintain idle connections during a soft reload instead of closing them immediately. These connections remain open until any of the following occurs:\n\n - A new request is received on the connection, in which\n case HAProxy handles it in the old process and closes\n the connection after sending the response.\n\n - HAProxy's `timeout http-keep-alive` duration expires.\n By default this is 300 seconds, but it can be changed\n using httpKeepAliveTimeout tuning option.\n\n - The client's keep-alive timeout expires, causing the\n client to close the connection.\n\nSetting Deferred can help prevent errors in clients or load balancers that do not properly handle connection resets. Additionally, this option allows you to retain the pre-2.4 HAProxy behaviour: in HAProxy version 2.2 (OpenShift versions < 4.14), maintaining idle connections during a soft reload was the default behaviour, but starting with HAProxy 2.4, the default changed to closing idle connections immediately.\n\nImportant Consideration:\n\n - Using Deferred will result in temporary inconsistencies\n for the first request on each persistent connection\n after a route update and router reload. This request\n will be processed by the old HAProxy process using its\n old configuration. Subsequent requests will use the\n updated configuration.\n\nOperational Considerations:\n\n - Keeping idle connections open during reloads may lead\n to an accumulation of old HAProxy processes if\n connections remain idle for extended periods,\n especially in environments where frequent reloads\n occur.\n\n - Consider monitoring the number of HAProxy processes in\n the router pods when Deferred is set.\n\n - You may need to enable or adjust the\n `ingress.operator.openshift.io/hard-stop-after`\n duration (configured via an annotation on the\n IngressController resource) in environments with\n frequent reloads to prevent resource exhaustion.", "closedClientConnectionPolicy": "closedClientConnectionPolicy controls how the IngressController behaves when the client closes the TCP connection while the TLS handshake or HTTP request is in progress. This option maps directly to HAProxy’s \"abortonclose\" option.\n\nValid values are: \"Abort\" and \"Continue\". The default value is \"Continue\".\n\nWhen set to \"Abort\", the router will stop processing the TLS handshake if it is in progress, and it will not send an HTTP request to the backend server if the request has not yet been sent when the client closes the connection.\n\nWhen set to \"Continue\", the router will complete the TLS handshake if it is in progress, or send an HTTP request to the backend server and wait for the backend server's response, regardless of whether the client has closed the connection.\n\nSetting \"Abort\" can help free CPU resources otherwise spent on TLS computation for connections the client has already closed, and can reduce request queue size, thereby reducing the load on saturated backend servers.\n\nImportant Considerations:\n\n - The default policy (\"Continue\") is HTTP-compliant, and requests\n for aborted client connections will still be served.\n Use the \"Continue\" policy to allow a client to send a request\n and then immediately close its side of the connection while\n still receiving a response on the half-closed connection.\n\n - When clients use keep-alive connections, the most common case for premature\n closure is when the user wants to cancel the transfer or when a timeout\n occurs. In that case, the \"Abort\" policy may be used to reduce resource consumption.\n\n - Using RSA keys larger than 2048 bits can significantly slow down\n TLS computations. Consider using the \"Abort\" policy to reduce CPU usage.", - "haproxyVersion": "haproxyVersion specifies the HAProxy version to use for this IngressController.\n\nOpenShift 5.1 continues with HAProxy 3.2 (same minor version introduced in OpenShift 5.0) and does not introduce a new HAProxy version.\n\nValid values for OpenShift 5.1: - Unset (default): Uses HAProxy 3.2 (the default for OpenShift 5.1) - \"3.2\": Uses the latest HAProxy 3.2.z available for this OpenShift release and pins the minor version.\n\nNote: HAProxy 2.8 support has been dropped in OpenShift 5.1. Upgrading from OpenShift 5.0 with haproxyVersion set to \"2.8\" is blocked.\n\nIf a specific HAProxy version is set and would become unsupported in a target cluster upgrade, a preflight check will block the cluster upgrade until this field is updated to unset or a supported version.", + "haproxyVersion": "haproxyVersion specifies the HAProxy version to use for this IngressController.\n\nOpenShift 5.1 uses HAProxy 3.2 as its default version and supports HAProxy 3.4 as an explicit, non-default opt-in.\n\nValid values for OpenShift 5.1: - Unset (default): Uses HAProxy 3.2 (the default for OpenShift 5.1) - \"3.2\": Uses the latest HAProxy 3.2.z available for this OpenShift release and pins the minor version. - \"3.4\": Uses the latest HAProxy 3.4.z available for this OpenShift release. This is an explicit opt-in; HAProxy 3.4 is not the default.\n\nPlanned lifecycle for later OpenShift releases: - OpenShift 5.2 plans to make HAProxy 3.4 the default when this field is unset, while continuing to support \"3.2\" as an explicit selection. - OpenShift 5.3 plans to retire support for selecting HAProxy 3.2.\n\nNote: HAProxy 2.8 support has been dropped in OpenShift 5.1. Upgrading from OpenShift 5.0 with haproxyVersion set to \"2.8\" is blocked.\n\nIf a specific HAProxy version is set and would become unsupported in a target cluster upgrade, a preflight check will block the cluster upgrade until this field is updated to unset or a supported version.", } func (IngressControllerSpec) SwaggerDoc() map[string]string { @@ -1192,7 +1263,7 @@ var map_IngressControllerStatus = map[string]string{ "observedGeneration": "observedGeneration is the most recent generation observed.", "namespaceSelector": "namespaceSelector is the actual namespaceSelector in use.", "routeSelector": "routeSelector is the actual routeSelector in use.", - "effectiveHAProxyVersion": "effectiveHAProxyVersion reports the HAProxy version currently in use by this IngressController. This reflects the resolved value of the spec.haproxyVersion field. When omitted, the effective value has not yet been resolved by the operator or the feature is not enabled for this cluster.\n\nExamples for OpenShift 5.1: - \"3.2\": Using HAProxy 3.2", + "effectiveHAProxyVersion": "effectiveHAProxyVersion reports the HAProxy version currently in use by this IngressController. This reflects the resolved value of the spec.haproxyVersion field. When omitted, the effective value has not yet been resolved by the operator or the feature is not enabled for this cluster.\n\nExamples for OpenShift 5.1: - \"3.2\": Using the default HAProxy 3.2 - \"3.4\": Using the explicitly selected, non-default HAProxy 3.4\n\nPlanned lifecycle for later OpenShift releases: - OpenShift 5.2 plans to make HAProxy 3.4 the default while keeping HAProxy 3.2 selectable. - OpenShift 5.3 plans to retire HAProxy 3.2.", } func (IngressControllerStatus) SwaggerDoc() map[string]string { @@ -1426,7 +1497,7 @@ var map_KMSPreflightResult = map[string]string{ "": "KMSPreflightResult contains the outcome of a preflight validation.", "status": "status indicates the outcome of the preflight check. Succeeded means the KMS plugin responded to Status, Encrypt, and Decrypt calls successfully. Failed means the validation did not pass.", "configHash": "configHash is the hash of the configuration that was validated. This is compared against observedConfigHash to confirm the result corresponds to the current configuration. The value must be exactly 8 characters.", - "remoteKeyID": "remoteKeyID is the remote key encryption key identifier from KMS v2 StatusResponse.key_id. This is not a cryptographic key, but a unique representation of the remote key used to encrypt data. The value must be between 1 and 1024 characters.", + "remoteKeyID": "remoteKeyID is the remote key encryption key identifier from KMS v2 StatusResponse.key_id. This is not a cryptographic key, but a unique representation of the remote key used to encrypt data. When omitted, no remote key identifier is available. This is expected when status is Failed, for example when the KMS provider could not be reached. When status is Succeeded, remoteKeyID is required. When set, the value must be between 1 and 1024 characters.", } func (KMSPreflightResult) SwaggerDoc() map[string]string { diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index bee2ba3a8c..7a8850ddfd 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -195,7 +195,7 @@ github.com/munnerz/goautoneg # github.com/oklog/run v1.2.0 ## explicit; go 1.20 github.com/oklog/run -# github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9 +# github.com/openshift/api v0.0.0-20261022144628-c3d7aef33fc1 ## explicit; go 1.26.0 github.com/openshift/api/config/v1 github.com/openshift/api/operator/v1 @@ -209,7 +209,7 @@ github.com/openshift/build-machinery-go/make/targets/golang github.com/openshift/build-machinery-go/make/targets/openshift github.com/openshift/build-machinery-go/make/targets/openshift/operator github.com/openshift/build-machinery-go/scripts -# github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7 +# github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4 ## explicit; go 1.26.0 github.com/openshift/library-go/pkg/crypto github.com/openshift/library-go/pkg/operator/apiserver/audit diff --git a/go.mod b/go.mod index b6c737b6a1..c173e016bb 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,10 @@ require ( github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // openshift-controller-manager github.com/google/go-cmp v0.7.0 github.com/miekg/dns v1.1.63 // microshift - github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9 + github.com/openshift/api v0.0.0-20261009034342-f9511d3fcb26 github.com/openshift/build-machinery-go v0.0.0-20260902143904-520f675c892b - github.com/openshift/client-go v0.0.0-20261001003915-dcaad1dc7fe8 - github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7 + github.com/openshift/client-go v0.0.0-20261006222332-348fc1ca8bb1 + github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4 github.com/ovn-kubernetes/libovsdb v0.8.2-0.20260302130604-c07ce22366ac github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cobra v1.10.2 @@ -34,7 +34,7 @@ require ( github.com/go-kit/kit v0.9.0 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 - github.com/openshift/cluster-policy-controller v0.0.0-20260902120314-c9e9a3482609 + github.com/openshift/cluster-policy-controller v0.0.0-20261019223900-81e222007c2c github.com/openshift/route-controller-manager v0.0.0-20260909174728-a158fff7ce38 github.com/prometheus/client_model v0.6.2 github.com/prometheus/common v0.70.0 diff --git a/go.sum b/go.sum index 82e649ca2c..1922ea874a 100644 --- a/go.sum +++ b/go.sum @@ -294,20 +294,20 @@ github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5 github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.15.1 h1:ERxeh5caJvCzNAKdI8WQbJmB1LDTn4BuaAg8wihLBpA= github.com/opencontainers/selinux v1.15.1/go.mod h1:LenyElirjUHszfxrjuFqC85HIeXZKumHcKMQtnaDlQQ= -github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9 h1:zs8Qkv9t4ZVomQAsu7Q8ZB74O9Wegnq02IK+KLRDknQ= -github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9/go.mod h1:2oI3aXQFDjjl7l4xA9ZPSkB+l+lyfWLg7P2sWg9yEvM= +github.com/openshift/api v0.0.0-20261009034342-f9511d3fcb26 h1:QcDGIyCCnKDz3BE/ISOoN/evxu8emuR5rYrESEqEXpY= +github.com/openshift/api v0.0.0-20261009034342-f9511d3fcb26/go.mod h1:2oI3aXQFDjjl7l4xA9ZPSkB+l+lyfWLg7P2sWg9yEvM= github.com/openshift/apiserver-library-go v0.0.0-20261001145254-218f2c488d90 h1:8fVYvLUYoZCvPAdQJ03ZggQFyDu1cvfjbpJgAAr9LXY= github.com/openshift/apiserver-library-go v0.0.0-20261001145254-218f2c488d90/go.mod h1:yTOZ7WWI3p2F3QIy6ZbCckONGF1KiEWRSkyGI6L9U74= github.com/openshift/build-machinery-go v0.0.0-20260902143904-520f675c892b h1:ErTc+6D1n/rpRaUYP++h0YlOzM+q7UaAdqDZrzhA0ho= github.com/openshift/build-machinery-go v0.0.0-20260902143904-520f675c892b/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/client-go v0.0.0-20261001003915-dcaad1dc7fe8 h1:yHA+77VmVlO0aBdZLmocC3EBYNza0B+Hwu+8hmkjj2k= -github.com/openshift/client-go v0.0.0-20261001003915-dcaad1dc7fe8/go.mod h1:VVl1SGimADe2vlYahxxxI87JOom7MPAiZqIDDhkedBU= -github.com/openshift/cluster-policy-controller v0.0.0-20260902120314-c9e9a3482609 h1:MwhDhCUKURbk47UN/jNqaivpbqJ601Cj5+THG/5IA2A= -github.com/openshift/cluster-policy-controller v0.0.0-20260902120314-c9e9a3482609/go.mod h1:ujufpXCwp5BBm/OseRiag45V2v7SOhow/O6EoMrVfWg= +github.com/openshift/client-go v0.0.0-20261006222332-348fc1ca8bb1 h1:HpoDz9EFYX1ujThB6iTQULFIMhUkvo7BhQb/7HSYPy4= +github.com/openshift/client-go v0.0.0-20261006222332-348fc1ca8bb1/go.mod h1:lFvdJoRyqXFPBtBOFrIo3aAhGutLblBULzdjC96NavI= +github.com/openshift/cluster-policy-controller v0.0.0-20261019223900-81e222007c2c h1:aS4RrHVajWx7n35wgB64ZBPfS8RFx7wT/baZc5YoG/g= +github.com/openshift/cluster-policy-controller v0.0.0-20261019223900-81e222007c2c/go.mod h1:I9ZlUy4OVLucpAdtbLDl7erG5MfHux/Jnvdxmo5f5eQ= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20261008231247-c67b43a2519e h1:xOe8GqQWd+IqUkPGLioEh2UUOW9rg2kg15TWBEnnyqY= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20261008231247-c67b43a2519e/go.mod h1:tmnKP57LIIDeGjt3PbZAiG7uPxcfll5pafow6i9lqJ8= -github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7 h1:PDH/v+jap31Eb4N9q+Q3X05QHIXZA4sVyr4zb/n+Cv0= -github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7/go.mod h1:k0EA2kHPdvdKgyV38lWS1u1eIgMBgrpWkCl2ei4A3ug= +github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4 h1:pDBleqJg6DPCMrEaJKGFbr+gnvXqm9z2SqQvTibEcrg= +github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4/go.mod h1:g3KONLBdxKU5r4K/Qcgg29Re5Rdx9URj0ZelXFGLxGo= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20260807173042-3ac00363bb14 h1:cqKhyYc25PdUmFFVrxX5oqiltnWn6UWrdoZRWVFSSCQ= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20260807173042-3ac00363bb14/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= github.com/openshift/route-controller-manager v0.0.0-20260909174728-a158fff7ce38 h1:fwfj89uebvh25Goqh1H2uEI57UGsC7EjuZYnW8AtXDk= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index c904753fc7..249972a9c9 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -2,6 +2,6 @@ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2e364d7ccd15761d3f8e62d8848ff5c406d9791b7b810b8cf44085f26b5284a4" +pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:65433c1f5e09b2896a657cc5098bb890e00be51438fb27a1f73ab6dd92c6e34b" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 723dad498b..cbf98a2af5 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -2,6 +2,6 @@ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d95d3c2a00e4a98c443901dc3d4bd22d0da2e3ba93b130d8fce74b0a554bd217" +pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:998ce44fa809241ddda5bb8d18635d3d6c24063be20dfee20db3c9a08115ceb4" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/assets_ai_model_serving.yaml b/scripts/auto-rebase/assets_ai_model_serving.yaml index 3b90e38e2f..d36c743e25 100644 --- a/scripts/auto-rebase/assets_ai_model_serving.yaml +++ b/scripts/auto-rebase/assets_ai_model_serving.yaml @@ -199,7 +199,5 @@ assets: src: ovms-kserve-template.yaml - file: vllm-cuda.yaml src: vllm-cuda-template.yaml - - file: vllm-gaudi.yaml - src: vllm-gaudi-template.yaml - file: vllm-rocm.yaml src: vllm-rocm-template.yaml diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index eb69f5d706..62a72fb73b 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,4 +1,60 @@ -- csi-external-snapshotter image-arm64 a019d1a9d9e1d26ffd0b2e0d911733180fa608b2 to a570de6a368dab9532e540d7f1ce10c3b03c6d1a +- cluster-ingress-operator embedded-component 45007ca6932ce7159ee5120084bde0a4d33c4b83 to 2bb2799f289338c4f3c16fa46d15ad1b7ef2cae6 + - 862a9df1 2026-10-20T13:36:15Z TRT-3032: Revert #1607 "OCPBUGS-121851: Report ingress Available=True on zero-worker HyperShift startup" + - 1db933fc 2026-10-19T20:16:24Z NE-2901: Document commit conventions + - 96770a98 2026-10-15T23:16:27Z Remove obsolete hardcoded replicas + - 557f9299 2026-10-07T16:06:02-03:00 Allow disabling endpoint address validation + - 892b47b1 2026-10-07T21:03:51+02:00 OCPBUGS-121851: Test Available=True/AwaitingNodes through node arrival and loss + - 57a6e938 2026-10-07T15:19:25+02:00 OCPBUGS-121851: Report ingress Progressing=False on zero-worker HyperShift startup + - 21a33c93 2026-10-07T12:16:43+02:00 OCPBUGS-121851: Add node-wait scenario tests and extract availability helper + - cfba2b5e 2026-10-06T12:15:52+02:00 OCPBUGS-121851: Report ingress Available=True on zero-worker HyperShift startup + +- cluster-kube-controller-manager-operator embedded-component c4854ad5ad5d1f9b2dfef3f721f96632334acde7 to 8935774b925a368067e112b15554534a85b87718 + - 7955edd 2026-10-16T14:45:46-06:00 STOR-2875: wire volumeForceDetach config observer for KCM + - f624d80 2026-10-16T14:39:04-06:00 Bump library-go to get ObserveVolumeForceDetach + +- cluster-network-operator embedded-component fc66cef8b3724a5d724fc8f8d9ef5c7bac755916 to 089066d165506791a70df51c6b546a9377e865c7 + - c60a139 2026-10-15T09:21:40+02:00 Align frr-k8s 5.1 CRDs + +- cluster-policy-controller embedded-component c9e9a348260921c9e788e33a51e904502cbe2d13 to 81e222007c2ceec48a908877eb71fb135a2c2453 + - 8a858a8 2026-10-19T11:44:21+01:00 OCPSTRAT-3618: go mod vendor + - e299ba8 2026-10-19T11:44:21+01:00 OCPSTRAT-3618: Bump ci/docker images + - 9cd10ee 2026-10-12T11:48:29+01:00 OCPSTRAT-3618: Rebase kube v1.37.1 + +- csi-external-snapshotter embedded-component a019d1a9d9e1d26ffd0b2e0d911733180fa608b2 to a570de6a368dab9532e540d7f1ce10c3b03c6d1a + - 8f2c6ee 2026-10-14T14:40:31+02:00 UPSTREAM: : Add OpenShift files + - d57944f 2026-10-12T13:38:26-04:00 Add changelog to release-8.7 branch + - 9c43be8 2026-10-11T09:07:12Z Squashed 'release-tools/' changes from 7c58653f..7bacb813 + - e4e4f5a 2026-10-09T11:12:03-04:00 feat: add regression test + - 278e31b 2026-10-09T11:12:03-04:00 fix: shutdown broadcaster when Run returns + - 756a409 2026-10-08T22:53:07-04:00 Fix unit test after updating deps + - 822794c 2026-10-08T22:04:33-04:00 Update K8s deps to 1.37 + - 73c720a 2026-10-08T21:57:31-04:00 Update deps + - f956292 2026-10-08T21:47:46-04:00 Ignore sidecar-owned VolumeGroupSnapshotContent updates to honor requeue backoff + - 01dc519 2026-08-20T13:49:06-04:00 Enable VGS feature gate + - 4799cee 2026-08-14T09:37:58Z fix: data race in scheduleOpsInFlightMetric + - 121c2a2 2026-08-14T09:07:51Z Squashed 'release-tools/' changes from 3472c3ffc..7c58653f2 + - 47f0b3d 2026-08-11T11:50:06Z fix: GHSA-hrxh-6v49-42gf + - 12d5cbf 2026-08-11T09:27:32Z Squashed 'release-tools/' changes from 34632b81..3472c3ff + - 280ec96 2026-08-04T17:54:31-04:00 Requeue VolumeGroupSnapshotContent with backoff when not ready to use + - 72fcb26 2026-07-28T15:23:41+02:00 Skip NotFound errors when deleting snapshot content objects + - 9b03820 2026-07-16T11:22:43Z Bump actions/setup-go from 6.5.0 to 7.0.0 + - 4dce899 2026-07-15T14:57:09Z Bump the github-dependencies group across 1 directory with 26 updates + - 7ed8205 2026-07-09T16:29:16+05:30 Squashed 'release-tools/' changes from 0d7d9d495..34632b812 + - 32e3774 2026-07-06T11:24:03Z Bump github.com/go-openapi/swag/jsonname from 0.26.1 to 0.27.0 + - e31226c 2026-06-29T14:00:27Z Bump the k8s-dependencies group across 1 directory with 7 updates + - 41694a5 2026-06-29T11:23:32Z Bump the github-dependencies group across 1 directory with 10 updates + - 6a31dcb 2026-06-24T11:22:42Z Bump actions/setup-go from 6.4.0 to 6.5.0 + - 8dc7e07 2026-06-19T11:22:25Z Bump actions/checkout from 6.0.2 to 7.0.0 + - 1d996ef 2026-06-09T14:13:02+05:30 deploy: update sidecar image versions + - a7b6be6 2026-06-09T03:36:49Z Squashed 'release-tools/' changes from 31186bf0a..0d7d9d495 + - e5b78e7 2026-06-08T11:24:28Z Bump the github-dependencies group across 1 directory with 28 updates + - 43d4672 2026-06-08T11:23:00Z Bump sigs.k8s.io/apiserver-network-proxy/konnectivity-client + - 9519baf 2026-05-28T17:16:23-04:00 Update deps in client + +- machine-config-operator embedded-component 64f25ad7893fe24b5774235375f9d03c5a46d36f to 7090103994904d03eb6467387c86c0ad5eb80a71 + - eb9ca7c9 2026-10-19T15:14:25Z OCPBUGS-132308: stabilize test 66436 - disable weak SSH cipher suites + +- csi-external-snapshotter image-amd64 a019d1a9d9e1d26ffd0b2e0d911733180fa608b2 to a570de6a368dab9532e540d7f1ce10c3b03c6d1a - 8f2c6ee 2026-10-14T14:40:31+02:00 UPSTREAM: : Add OpenShift files - d57944f 2026-10-12T13:38:26-04:00 Add changelog to release-8.7 branch - 9c43be8 2026-10-11T09:07:12Z Squashed 'release-tools/' changes from 7c58653f..7bacb813 @@ -29,7 +85,7 @@ - 43d4672 2026-06-08T11:23:00Z Bump sigs.k8s.io/apiserver-network-proxy/konnectivity-client - 9519baf 2026-05-28T17:16:23-04:00 Update deps in client -- ovn-kubernetes image-arm64 0de3886bb79aa0db71e17ddc42898f934e43359e to 0d60766d732f5d158ab77ab915a3fbceb13cdf50 +- ovn-kubernetes image-amd64 0de3886bb79aa0db71e17ddc42898f934e43359e to 0d60766d732f5d158ab77ab915a3fbceb13cdf50 - aa1cad3b 2026-10-15T13:19:32+05:30 Keep the OVN bindings on the version we ship - 8986384d 2026-10-15T13:18:17+05:30 e2e: register openshift extension images from DeploymentConfig - 3ef2999d 2026-10-13T12:37:03+02:00 e2e: remove obsolete KubeVirt image cleanup diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 719cf20db3..c7618e8c19 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,29 +1,29 @@ https://github.com/openshift/api embedded-component 24b2699a9b327b3ab54962520e809745f8adf96c https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 41e9a6ccf361de2b37c0e91c2e03fb7fec31a634 https://github.com/openshift/cluster-dns-operator embedded-component 9d18bdd71092bd9eaad426c6ec42b719c3a992e9 -https://github.com/openshift/cluster-ingress-operator embedded-component 45007ca6932ce7159ee5120084bde0a4d33c4b83 +https://github.com/openshift/cluster-ingress-operator embedded-component 2bb2799f289338c4f3c16fa46d15ad1b7ef2cae6 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 5f22e9c7b00f1cd914e9938ef56899684ee8ac5a -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component c4854ad5ad5d1f9b2dfef3f721f96632334acde7 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 8935774b925a368067e112b15554534a85b87718 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component ab8cbfbb1e5532cec39d08c6e84b8f8c0ea856ef -https://github.com/openshift/cluster-network-operator embedded-component fc66cef8b3724a5d724fc8f8d9ef5c7bac755916 +https://github.com/openshift/cluster-network-operator embedded-component 089066d165506791a70df51c6b546a9377e865c7 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 8da2f1fcb1e76e8b1b97b16ca7bbfa7116287eb8 -https://github.com/openshift/cluster-policy-controller embedded-component c9e9a348260921c9e788e33a51e904502cbe2d13 -https://github.com/openshift/csi-external-snapshotter embedded-component a019d1a9d9e1d26ffd0b2e0d911733180fa608b2 +https://github.com/openshift/cluster-policy-controller embedded-component 81e222007c2ceec48a908877eb71fb135a2c2453 +https://github.com/openshift/csi-external-snapshotter embedded-component a570de6a368dab9532e540d7f1ce10c3b03c6d1a https://github.com/openshift/etcd embedded-component 8480451b19d39e15760c32e773521a295920eaa9 https://github.com/openshift/kubernetes embedded-component 8e30e543958ab5d408a337a5957663e5fd9aea12 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component c67b43a2519e63f02e4be27ae6c8d4edcbc75950 -https://github.com/openshift/machine-config-operator embedded-component 64f25ad7893fe24b5774235375f9d03c5a46d36f +https://github.com/openshift/machine-config-operator embedded-component 7090103994904d03eb6467387c86c0ad5eb80a71 https://github.com/openshift/openshift-controller-manager embedded-component 72964318318f2a65e66b766a288b2241e6a6c51e https://github.com/openshift/operator-framework-olm embedded-component 14f999ff089a3275d3a144224e871d825461ec3b https://github.com/openshift/route-controller-manager embedded-component a158fff7ce3826058bd2d7338b206cdd600d0d40 https://github.com/openshift/service-ca-operator embedded-component ed872ba14b615ca5726ae90e987268877a0b0b20 https://github.com/openshift/oc image-amd64 586088c46cba2cd87e1a128a304fe484cf678cd5 https://github.com/openshift/coredns image-amd64 83aefed36b4dd6eb800885e56af7cf97fc9db8d7 -https://github.com/openshift/csi-external-snapshotter image-amd64 a019d1a9d9e1d26ffd0b2e0d911733180fa608b2 +https://github.com/openshift/csi-external-snapshotter image-amd64 a570de6a368dab9532e540d7f1ce10c3b03c6d1a https://github.com/openshift/router image-amd64 01bee8da2387d0cfbd7a1acd934bb92a8c320527 https://github.com/openshift/router image-amd64 01bee8da2387d0cfbd7a1acd934bb92a8c320527 https://github.com/openshift/kube-rbac-proxy image-amd64 75554a0355eb0c9b25904102437a529703af89b8 -https://github.com/openshift/ovn-kubernetes image-amd64 0de3886bb79aa0db71e17ddc42898f934e43359e +https://github.com/openshift/ovn-kubernetes image-amd64 0d60766d732f5d158ab77ab915a3fbceb13cdf50 https://github.com/openshift/kubernetes image-amd64 8e30e543958ab5d408a337a5957663e5fd9aea12 https://github.com/openshift/service-ca-operator image-amd64 ed872ba14b615ca5726ae90e987268877a0b0b20 https://github.com/openshift/oc image-arm64 586088c46cba2cd87e1a128a304fe484cf678cd5 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 19076040ac..c77890d490 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.1.0-0.nightly-2026-10-18-125305" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.1.0-0.nightly-arm64-2026-10-19-220957" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.1.0-0.nightly-2026-10-21-040310" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.1.0-0.nightly-arm64-2026-10-21-160957" diff --git a/vendor/github.com/openshift/api/.gitignore b/vendor/github.com/openshift/api/.gitignore index 1c3e4625d3..c396dc0828 100644 --- a/vendor/github.com/openshift/api/.gitignore +++ b/vendor/github.com/openshift/api/.gitignore @@ -19,3 +19,4 @@ tests/bin/ models-schema /render /write-available-featuresets +mise.toml diff --git a/vendor/github.com/openshift/api/.golangci.yaml b/vendor/github.com/openshift/api/.golangci.yaml index 1b8472410f..a8e859f7ac 100644 --- a/vendor/github.com/openshift/api/.golangci.yaml +++ b/vendor/github.com/openshift/api/.golangci.yaml @@ -110,6 +110,10 @@ linters: - kubeapilinter # osin/v1 types are config file APIs, not CRDs — validation is handled in Go code at config load time. path: osin/v1/types.go + - linters: + - kubeapilinter + # authentication/v1alpha1 types are config file APIs, not CRDs — validation is handled by oauth-apiserver at config load time. + path: authentication/v1alpha1/types_authentication_configuration.go - linters: - kubeapilinter # Silence norefs lint for `Ref` field in ClusterAPI as it refers to an OCI image reference, not a kube object reference. @@ -121,6 +125,23 @@ linters: # to enforce specific condition types are always present. path: etcd/v1/types_pacemakercluster.go text: "conditions: Conditions field in (PacemakerClusterStatus|PacemakerClusterNodeStatus|PacemakerClusterFencingAgentStatus|PacemakerClusterResourceStatus) is missing the following markers: optional" + - linters: + - kubeapilinter + # ConsoleSpec.Ingress is a legacy optional value struct. Requiring properties would + # change the validation of the stable API, so preserve the existing wire behavior. + path: '^operator/v1/types_console\.go$' + text: '^minlength: field ConsoleSpec\.Ingress type ConsoleIngress must have either a required field or a minimum properties, add kubebuilder:validation:MinProperties marker$' + - linters: + - kubeapilinter + # ConsoleSpec.Ingress is intentionally a value struct in the stable API; changing + # it to a pointer would break existing Go consumers. + path: '^operator/v1/types_console\.go$' + text: '^optionalfields: field ConsoleSpec\.Ingress has a valid zero value \(\{"consoleURL": "", "clientDownloadsURL": ""\}\) and should be a pointer\.$' + - linters: + - kubeapilinter + # Preserve the legacy JSON serialization of ConsoleSpec.Ingress. + path: '^operator/v1/types_console\.go$' + text: '^optionalfields: field ConsoleSpec\.Ingress should have the omitempty tag\.$' - linters: - kubeapilinter path: features|payload-command/ diff --git a/vendor/github.com/openshift/api/authentication/install.go b/vendor/github.com/openshift/api/authentication/install.go new file mode 100644 index 0000000000..8d27dd1acd --- /dev/null +++ b/vendor/github.com/openshift/api/authentication/install.go @@ -0,0 +1,24 @@ +package authentication + +import ( + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + + authenticationv1alpha1 "github.com/openshift/api/authentication/v1alpha1" +) + +const GroupName = "authentication.openshift.io" + +var ( + schemeBuilder = runtime.NewSchemeBuilder(authenticationv1alpha1.Install) + // Install adds every version of this group to a scheme. + Install = schemeBuilder.AddToScheme +) + +func Resource(resource string) schema.GroupResource { + return schema.GroupResource{Group: GroupName, Resource: resource} +} + +func Kind(kind string) schema.GroupKind { + return schema.GroupKind{Group: GroupName, Kind: kind} +} diff --git a/vendor/github.com/openshift/api/authentication/v1alpha1/doc.go b/vendor/github.com/openshift/api/authentication/v1alpha1/doc.go new file mode 100644 index 0000000000..5c21b5d600 --- /dev/null +++ b/vendor/github.com/openshift/api/authentication/v1alpha1/doc.go @@ -0,0 +1,9 @@ +// +k8s:deepcopy-gen=package,register +// +k8s:conversion-gen=github.com/openshift/oauth-apiserver/pkg/externaloidc/apis/authentication +// +k8s:defaulter-gen=TypeMeta +// +k8s:openapi-gen=true +// +k8s:openapi-model-package=com.github.openshift.api.authentication.v1alpha1 + +// +groupName=authentication.openshift.io +// Package v1alpha1 is the v1alpha1 version of the external OIDC authentication configuration API. +package v1alpha1 diff --git a/vendor/github.com/openshift/api/authentication/v1alpha1/register.go b/vendor/github.com/openshift/api/authentication/v1alpha1/register.go new file mode 100644 index 0000000000..d8f14e17d2 --- /dev/null +++ b/vendor/github.com/openshift/api/authentication/v1alpha1/register.go @@ -0,0 +1,33 @@ +package v1alpha1 + +import ( + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +const GroupName = "authentication.openshift.io" + +var ( + GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} + schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) + // Install adds this version to a scheme. + Install = schemeBuilder.AddToScheme + + // SchemeGroupVersion is retained for generated-code compatibility. + // Deprecated. + SchemeGroupVersion = GroupVersion + // AddToScheme is retained for generated-code compatibility. + // Deprecated. + AddToScheme = schemeBuilder.AddToScheme +) + +// Resource is retained for generated-code compatibility. +// Deprecated. +func Resource(resource string) schema.GroupResource { + return GroupVersion.WithResource(resource).GroupResource() +} + +func addKnownTypes(scheme *runtime.Scheme) error { + scheme.AddKnownTypes(GroupVersion, &AuthenticationConfiguration{}) + return nil +} diff --git a/vendor/github.com/openshift/api/authentication/v1alpha1/types_authentication_configuration.go b/vendor/github.com/openshift/api/authentication/v1alpha1/types_authentication_configuration.go new file mode 100644 index 0000000000..b7e98768b1 --- /dev/null +++ b/vendor/github.com/openshift/api/authentication/v1alpha1/types_authentication_configuration.go @@ -0,0 +1,576 @@ +package v1alpha1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +/* + +The types in this file are heavily inspired by the existing +Kubernetes AuthenticationConfiguration type found at +https://github.com/kubernetes/kubernetes/blob/b2f73c0d6b427e2ab5ba225375aaefc0b9bc45b2/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1/types.go#L56 + +The API surface here intentionally aligns with this API because it is meant +to be a wrapper around that API with some customization to support unique +functionality that OpenShift needs. + +*/ + +// AuthenticationConfiguration is the configuration-file API read by the +// oauth-apiserver when it runs in External OIDC mode. +// +// The cluster-authentication-operator is the only component that writes this +// configuration file. It generates the file from the user-facing +// config.openshift.io/v1, Kind=Authentication API. This type is not a CRD and +// must not be configured directly. +// +// The oauth-apiserver performs semantic validation when it reads this file. See +// https://github.com/openshift/oauth-apiserver/blob/97a820bd5412/pkg/externaloidc/apis/authentication/validation/validation.go. +// +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// +// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. +// +openshift:compatibility-gen:level=4 +// +openshift:compatibility-gen:internal +type AuthenticationConfiguration struct { + metav1.TypeMeta `json:",inline"` + + // jwt is a list of authenticator to authenticate Kubernetes users using + // JWT compliant tokens. The authenticator will attempt to parse a raw ID token, + // verify it's been signed by the configured issuer. The public key to verify the + // signature is discovered from the issuer's public endpoint using OIDC discovery. + // For an incoming token, each JWT authenticator will be attempted in + // the order in which it is specified in this list. Note however that + // other authenticators may run before or after the JWT authenticators. + // The specific position of JWT authenticators in relation to other + // authenticators is neither defined nor stable across releases. Since + // each JWT authenticator must have a unique issuer URL, at most one + // JWT authenticator will attempt to cryptographically validate the token. + // + // The minimum valid JWT payload must contain the following claims: + // { + // "iss": "https://issuer.example.com", + // "aud": ["audience"], + // "exp": 1234567890, + // "": "username" + // } + // +listType=atomic + JWT []JWTAuthenticator `json:"jwt,omitempty"` +} + +// JWTAuthenticator configures one JWT authenticator. +type JWTAuthenticator struct { + // issuer contains the basic OIDC provider connection options. + // +required + Issuer *Issuer `json:"issuer,omitempty"` + + // claimValidationRules are rules that are applied to validate token claims to authenticate users. + // +listType=atomic + // +optional + ClaimValidationRules []ClaimValidationRule `json:"claimValidationRules,omitempty"` + + // claimMappings points claims of a token to be treated as user attributes. + // +required + ClaimMappings *ClaimMappings `json:"claimMappings,omitempty"` + + // userValidationRules are rules that are applied to final user before completing authentication. + // These allow invariants to be applied to incoming identities such as preventing the + // use of the system: prefix that is commonly used by Kubernetes components. + // The validation rules are logically ANDed together and must all return true for the validation to pass. + // +listType=atomic + // +optional + UserValidationRules []UserValidationRule `json:"userValidationRules,omitempty"` + + // externalClaimsSources is an optional field that can be used to configure + // sources, external to the token provided in a request, in which claims + // should be fetched from and made available to the claim mapping process + // that is used to build the identity of a token holder. + // For example, fetching additional user metadata from an OIDC provider's UserInfo endpoint. + // externalClaimsSources must not exceed 5 entries. + // +listType=atomic + // +optional + ExternalClaimsSources []ExternalClaimsSource `json:"externalClaimsSources,omitempty"` +} + +// Issuer provides the configuration for an external provider's specific settings. +type Issuer struct { + // url points to the issuer URL in a format https://url or https://url/path. + // This must match the "iss" claim in the presented JWT, and the issuer returned from discovery. + // Same value as the --oidc-issuer-url flag. + // Discovery information is fetched from "{url}/.well-known/openid-configuration" unless overridden by discoveryURL. + // Required to be unique across all JWT authenticators. + // Note that egress selection configuration is not used for this network connection. + // +required + URL string `json:"url"` + + // discoveryURL, if specified, overrides the URL used to fetch discovery + // information instead of using "{url}/.well-known/openid-configuration". + // The exact value specified is used, so "/.well-known/openid-configuration" + // must be included in discoveryURL if needed. + // + // The "issuer" field in the fetched discovery information must match the "issuer.url" field + // in the AuthenticationConfiguration and will be used to validate the "iss" claim in the presented JWT. + // This is for scenarios where the well-known and jwks endpoints are hosted at a different + // location than the issuer (such as locally in the cluster). + // + // Example: + // A discovery url that is exposed using kubernetes service 'oidc' in namespace 'oidc-namespace' + // and discovery information is available at '/.well-known/openid-configuration'. + // discoveryURL: "https://oidc.oidc-namespace/.well-known/openid-configuration" + // certificateAuthority is used to verify the TLS connection and the hostname on the leaf certificate + // must be set to 'oidc.oidc-namespace'. + // + // curl https://oidc.oidc-namespace/.well-known/openid-configuration (.discoveryURL field) + // { + // issuer: "https://oidc.example.com" (.url field) + // } + // + // discoveryURL must be different from url. + // Required to be unique across all JWT authenticators. + // Note that egress selection configuration is not used for this network connection. + // +optional + DiscoveryURL string `json:"discoveryURL,omitempty"` + + // certificateAuthority contains PEM-encoded certificate authority certificates + // used to validate the connection when fetching discovery information. + // If unset, the system verifier is used. + // Same value as the content of the file referenced by the --oidc-ca-file flag. + // +optional + CertificateAuthority string `json:"certificateAuthority,omitempty"` + + // audiences is the set of acceptable audiences the JWT must be issued to. + // At least one of the entries must match the "aud" claim in presented JWTs. + // Same value as the --oidc-client-id flag (though this field supports an array). + // Required to be non-empty. + // +listType=atomic + // +required + Audiences []string `json:"audiences"` + + // audienceMatchPolicy defines how the "audiences" field is used to match the "aud" claim in the presented JWT. + // Allowed values are: + // 1. "MatchAny" when multiple audiences are specified and + // 2. empty (or unset) or "MatchAny" when a single audience is specified. + // + // - MatchAny: the "aud" claim in the presented JWT must match at least one of the entries in the "audiences" field. + // For example, if "audiences" is ["foo", "bar"], the "aud" claim in the presented JWT must contain either "foo" or "bar" (and may contain both). + // + // - "": The match policy can be empty (or unset) when a single audience is specified in the "audiences" field. The "aud" claim in the presented JWT must contain the single audience (and may contain others). + // + // For more nuanced audience validation, use claimValidationRules. + // example: claimValidationRule[].expression: 'sets.equivalent(claims.aud, ["bar", "foo", "baz"])' to require an exact match. + // +optional + AudienceMatchPolicy AudienceMatchPolicyType `json:"audienceMatchPolicy,omitempty"` +} + +// AudienceMatchPolicyType is a set of valid values for issuer.audienceMatchPolicy +type AudienceMatchPolicyType string + +// Valid types for AudienceMatchPolicyType +const ( + // MatchAny means the "aud" claim in the presented JWT must match at least one of the entries in the "audiences" field. + AudienceMatchPolicyMatchAny AudienceMatchPolicyType = "MatchAny" +) + +// ClaimValidationRule provides the configuration for a single claim validation rule. +type ClaimValidationRule struct { + // claim is the name of a required claim. + // Same as --oidc-required-claim flag. + // Only string claim keys are supported. + // Mutually exclusive with expression and message. + // +optional + Claim string `json:"claim,omitempty"` + // requiredValue is the value of a required claim. + // Same as --oidc-required-claim flag. + // Only string claim values are supported. + // If claim is set and requiredValue is not set, the claim must be present with a value set to the empty string. + // Mutually exclusive with expression and message. + // +optional + RequiredValue string `json:"requiredValue,omitempty"` + + // expression represents the expression which will be evaluated by CEL. + // Must produce a boolean. + // + // CEL expressions have access to the contents of the token claims, organized into CEL variable: + // - 'claims' is a map of claim names to claim values. + // For example, a variable named 'sub' can be accessed as 'claims.sub'. + // Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'. + // Must return true for the validation to pass. + // + // Documentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/ + // + // Mutually exclusive with claim and requiredValue. + // +optional + Expression string `json:"expression,omitempty"` + // message customizes the returned error message when expression returns false. + // message is a literal string. + // Mutually exclusive with claim and requiredValue. + // +optional + Message string `json:"message,omitempty"` +} + +// ClaimMappings provides the configuration for claim mapping +type ClaimMappings struct { + // username represents an option for the username attribute. + // The claim's value must be a singular string. + // Same as the --oidc-username-claim and --oidc-username-prefix flags. + // If username.expression is set, the expression must produce a string value. + // If username.expression uses 'claims.email', then 'claims.email_verified' must be used in + // username.expression or extra[*].valueExpression or claimValidationRules[*].expression. + // An example claim validation rule expression that matches the validation automatically + // applied when username.claim is set to 'email' is 'claims.?email_verified.orValue(true) == true'. By explicitly comparing + // the value to true, we let type-checking see the result will be a boolean, and to make sure a non-boolean email_verified + // claim will be caught at runtime. + // + // In the flag based approach, the --oidc-username-claim and --oidc-username-prefix are optional. If --oidc-username-claim is not set, + // the default value is "sub". For the authentication config, there is no defaulting for claim or prefix. The claim and prefix must be set explicitly. + // For claim, if --oidc-username-claim was not set with legacy flag approach, configure username.claim="sub" in the authentication config. + // For prefix: + // (1) --oidc-username-prefix="-", no prefix was added to the username. For the same behavior using authentication config, + // set username.prefix="" + // (2) --oidc-username-prefix="" and --oidc-username-claim != "email", prefix was "#". For the same + // behavior using authentication config, set username.prefix="#" + // (3) --oidc-username-prefix="". For the same behavior using authentication config, set username.prefix="" + // +required + Username PrefixedClaimOrExpression `json:"username"` + // groups represents an option for the groups attribute. + // The claim's value must be a string or string array claim. + // If groups.claim is set, the prefix must be specified (and can be the empty string). + // If groups.expression is set, the expression must produce a string or string array value. + // "", [], and null values are treated as the group mapping not being present. + // +optional + Groups PrefixedClaimOrExpression `json:"groups,omitempty"` + + // uid represents an option for the uid attribute. + // Claim must be a singular string claim. + // If uid.expression is set, the expression must produce a string value. + // +optional + UID ClaimOrExpression `json:"uid"` + + // extra represents an option for the extra attribute. + // expression must produce a string or string array value. + // If the value is empty, the extra mapping will not be present. + // + // hard-coded extra key/value + // - key: "foo" + // valueExpression: "'bar'" + // This will result in an extra attribute - foo: ["bar"] + // + // hard-coded key, value copying claim value + // - key: "foo" + // valueExpression: "claims.some_claim" + // This will result in an extra attribute - foo: [value of some_claim] + // + // hard-coded key, value derived from claim value + // - key: "admin" + // valueExpression: '(has(claims.is_admin) && claims.is_admin) ? "true":""' + // This will result in: + // - if is_admin claim is present and true, extra attribute - admin: ["true"] + // - if is_admin claim is present and false or is_admin claim is not present, no extra attribute will be added + // + // +listType=atomic + // +optional + Extra []ExtraMapping `json:"extra,omitempty"` +} + +// PrefixedClaimOrExpression provides the configuration for a single prefixed claim or expression. +type PrefixedClaimOrExpression struct { + // claim is the JWT claim to use. + // Mutually exclusive with expression. + // +optional + Claim string `json:"claim,omitempty"` + // prefix is prepended to claim's value to prevent clashes with existing names. + // prefix needs to be set if claim is set and can be the empty string. + // Mutually exclusive with expression. + // +optional + Prefix *string `json:"prefix,omitempty"` + + // expression represents the expression which will be evaluated by CEL. + // + // CEL expressions have access to the contents of the token claims, organized into CEL variable: + // - 'claims' is a map of claim names to claim values. + // For example, a variable named 'sub' can be accessed as 'claims.sub'. + // Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'. + // + // Documentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/ + // + // Mutually exclusive with claim and prefix. + // +optional + Expression string `json:"expression,omitempty"` +} + +// ClaimOrExpression provides the configuration for a single claim or expression. +type ClaimOrExpression struct { + // claim is the JWT claim to use. + // Either claim or expression must be set. + // Mutually exclusive with expression. + // +optional + Claim string `json:"claim,omitempty"` + + // expression represents the expression which will be evaluated by CEL. + // + // CEL expressions have access to the contents of the token claims, organized into CEL variable: + // - 'claims' is a map of claim names to claim values. + // For example, a variable named 'sub' can be accessed as 'claims.sub'. + // Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'. + // + // Documentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/ + // + // Mutually exclusive with claim. + // +optional + Expression string `json:"expression,omitempty"` +} + +// ExtraMapping provides the configuration for a single extra mapping. +type ExtraMapping struct { + // key is a string to use as the extra attribute key. + // key must be a domain-prefix path (e.g. example.org/foo). All characters before the first "/" must be a valid + // subdomain as defined by RFC 1123. All characters trailing the first "/" must + // be valid HTTP Path characters as defined by RFC 3986. + // key must be lowercase. + // Required to be unique. + // +required + Key string `json:"key"` + + // valueExpression is a CEL expression to extract extra attribute value. + // valueExpression must produce a string or string array value. + // "", [], and null values are treated as the extra mapping not being present. + // Empty string values contained within a string array are filtered out. + // + // CEL expressions have access to the contents of the token claims, organized into CEL variable: + // - 'claims' is a map of claim names to claim values. + // For example, a variable named 'sub' can be accessed as 'claims.sub'. + // Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'. + // + // Documentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/ + // + // +required + ValueExpression string `json:"valueExpression"` +} + +// UserValidationRule provides the configuration for a single user info validation rule. +type UserValidationRule struct { + // expression represents the expression which will be evaluated by CEL. + // Must return true for the validation to pass. + // + // CEL expressions have access to the contents of UserInfo, organized into CEL variable: + // - 'user' - authentication.k8s.io/v1, Kind=UserInfo object + // Refer to https://github.com/kubernetes/api/blob/release-1.28/authentication/v1/types.go#L105-L122 for the definition. + // API documentation: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#userinfo-v1-authentication-k8s-io + // + // Documentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/ + // + // +required + Expression string `json:"expression"` + + // message customizes the returned error message when rule returns false. + // message is a literal string. + // +optional + Message string `json:"message,omitempty"` +} + +// ExternalClaimsSource provides the configuration for a single external claim source. +type ExternalClaimsSource struct { + // authentication is an optional field that configures how the apiserver authenticates with an external claims source. + // When not specified, anonymous authentication is used. + // +optional + Authentication *Authentication `json:"authentication,omitempty"` + // tls is an optional field that configures the http client TLS + // settings when fetching external claims from this source. + // At least one subfield must be set when this field is specified. + // +optional + TLS *TLS `json:"tls,omitempty"` + // url is a required configuration of the URL + // for which the external claims are located. + // +required + URL *SourceURL `json:"url,omitempty"` + // mappings is a required list of the claim + // and response handling expression pairs + // that produces the claims from the external source. + // + // mappings must have at least 1 entry and must not exceed 16 entries. + // Entries must have a unique name across all external claim sources. + // + // WARNING: claims sourced using these mappings will override any claims + // that exist within the token during the claim-to-identity mapping + // process. Use caution when sourcing external claims to avoid unintentionally + // overriding token claims. To help guard against this, sourcing + // external claims can have guard conditions defined in the 'conditions' + // field. + // + // +listType=atomic + // +required + Mappings []SourcedClaimMapping `json:"mappings,omitempty"` + // conditions is an optional list of conditions in + // which claims should attempt to be fetched from this + // external source. + // When omitted or empty, claims are always attempted to be fetched + // from this external source. + // When specified, all conditions must evaluate to 'true' + // before claims are attempted to be fetched from this external source. + // conditions must not exceed 16 entries. + // Entries must have unique expressions. + // +listType=atomic + // +optional + Conditions []ExternalSourceCondition `json:"conditions,omitempty"` +} + +// TLS configures the TLS options that the apiserver uses as a client +// when making a request to the external claim source. +// At least one field must be set when specified. +type TLS struct { + // certificateAuthority is an optional field that configures the certificate authority + // used to validate TLS connections with the external claims source. + // Must not be empty and must be a valid PEM-encoded certificate. + // +optional + CertificateAuthority *string `json:"certificateAuthority,omitempty"` +} + +// Authentication configures how the apiserver should attempt to authenticate +// with an external claims source. +type Authentication struct { + // type is a required field that sets the type of + // authentication method used by the authenticator + // when fetching external claims. + // + // Allowed values are 'RequestProvidedToken' and 'ClientCredential'. + // + // When set to 'RequestProvidedToken', the authenticator will + // use the token provided to the kube-apiserver as part of the + // request to authenticate with the external claims source. + // + // When set to 'ClientCredential', the authenticator will + // use the configured client-id, client-secret, and token endpoint + // to fetch an access token using the OAuth2 client credentials grant + // flow. The fetched access token will then be used to authenticate + // with the external claims source. + // +required + Type *AuthenticationType `json:"type,omitempty"` + + // clientCredential configures the client credentials + // and token endpoint to use to get an access token. + // This field must be set when type is ClientCredential. + // This field must not be set when type is not ClientCredential. + // +optional + ClientCredential *ClientCredentialConfig `json:"clientCredential,omitempty"` +} + +// AuthenticationType is the type of authentication that should be used +// when fetching claims from an external source. +type AuthenticationType string + +const ( + // AuthenticationTypeRequestProvidedToken is an AuthenticationType + // that represents that the token being evaluated for authentication + // should be used for authenticating with the external claims source. + // This is useful for scenarios where a token has multiple audiences + // and scopes so that it can be used to access both the cluster and + // the UserInfo endpoint that contains additional information about the + // user not present in the token. + AuthenticationTypeRequestProvidedToken AuthenticationType = "RequestProvidedToken" + + // AuthenticationTypeClientCredential is an AuthenticationType + // that represents that the authenticator should use the OAuth2 + // client credentials grant flow to obtain an access token for + // authenticating with the external claims source. + // This is useful for scenarios such as fetching user information + // from Microsoft's Graph API where a separate client credential + // is needed to access the API. + AuthenticationTypeClientCredential AuthenticationType = "ClientCredential" +) + +// ClientCredentialConfig configures the client credentials and token endpoint +// to use to get an access token via the OAuth2 client credentials grant flow. +type ClientCredentialConfig struct { + // clientID is the client identifier to use during the OAuth2 client credentials flow. + // clientID must not be an empty string (""). + // clientID must only contain printable ASCII characters. + // +required + ClientID string `json:"clientID,omitempty"` + + // clientSecret is the client secret to use during the OAuth2 client credentials flow. + // clientSecret is the literal string value of the client secret. + // clientSecret must not be an empty string (""). + // clientSecret must only contain printable ASCII characters. + // +required + ClientSecret string `json:"clientSecret,omitempty"` + + // tokenEndpoint is a required URL to query for an access token using + // the client credential OAuth2 flow. + // tokenEndpoint must not be an empty string (""). + // tokenEndpoint must be a valid HTTPS URL. + // tokenEndpoint must have a host and a path. + // tokenEndpoint must not contain query parameters, fragments, + // or user information (e.g., "user:password@host"). + // +required + TokenEndpoint string `json:"tokenEndpoint,omitempty"` + + // scopes is an optional list of OAuth2 scopes to request when obtaining + // an access token. If not specified, the token endpoint's default scopes + // will be used. Each scope must not be an empty string (""). + // +listType=atomic + // +optional + Scopes []string `json:"scopes,omitempty"` + + // tls is an optional field that configures the http client TLS + // settings when fetching an access token for this source. + // At least one subfield must be set when this field is specified. + // +optional + TLS *TLS `json:"tls,omitempty"` +} + +// SourceURL configures the options used to build the URL that is queried for external claims. +type SourceURL struct { + // hostname is a required hostname for which the external claims are located. + // It must be a valid DNS subdomain name as per RFC1123. + // This means that it must start and end with a lowercase alphanumeric character, + // must only consist of lowercase alphanumeric characters, '-', and '.'. + // hostname must not be an empty string ("") and must not exceed 253 characters in length. + // hostname may optionally specify a port in the format ':{port}'. + // +required + Hostname *string `json:"hostname,omitempty"` + // pathExpression is a required CEL expression that returns a list + // of string values used to construct the URL path. + // Claims from the token used for the request to the kube-apiserver + // are made available via the `claims` variable. + // expression must not be an empty string (""). + // +required + PathExpression *string `json:"pathExpression,omitempty"` +} + +// SourcedClaimMapping configures the mapping behavior for a single external claim +// from the response the apiserver received from the external claim source. +type SourcedClaimMapping struct { + // name is a required name of the claim that + // will be produced and made available during + // the claim-to-identity mapping process. + // name must consist of only lowercase alpha characters and underscores ('_'). + // name must not be an empty string ("") and must not exceed 256 characters in length. + // +required + Name *string `json:"name,omitempty"` + + // expression is a required CEL expression that + // will produce a value to be assigned to the claim. + // The full response body from the request to the + // external claim source is provided via the + // `response` variable. + // expression must not be an empty string (""). + // +required + Expression *string `json:"expression,omitempty"` +} + +// ExternalSourceCondition configures a singular condition +// that must return true before the external source is queried +// to retrieve external claims. +type ExternalSourceCondition struct { + // expression is a required CEL expression that + // is used to determine whether or not an external + // source should be used to fetch external claims. + // The expression must return a boolean value, + // where true means that the source should be consulted + // and false means that it should not. + // Claims from the token used for the request to the kube-apiserver + // are made available via the `claims` variable. + // expression must not be an empty string (""). + // +required + Expression *string `json:"expression,omitempty"` +} diff --git a/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.deepcopy.go new file mode 100644 index 0000000000..30c73962ba --- /dev/null +++ b/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.deepcopy.go @@ -0,0 +1,406 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +// Code generated by codegen. DO NOT EDIT. + +package v1alpha1 + +import ( + runtime "k8s.io/apimachinery/pkg/runtime" +) + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Authentication) DeepCopyInto(out *Authentication) { + *out = *in + if in.Type != nil { + in, out := &in.Type, &out.Type + *out = new(AuthenticationType) + **out = **in + } + if in.ClientCredential != nil { + in, out := &in.ClientCredential, &out.ClientCredential + *out = new(ClientCredentialConfig) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Authentication. +func (in *Authentication) DeepCopy() *Authentication { + if in == nil { + return nil + } + out := new(Authentication) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AuthenticationConfiguration) DeepCopyInto(out *AuthenticationConfiguration) { + *out = *in + out.TypeMeta = in.TypeMeta + if in.JWT != nil { + in, out := &in.JWT, &out.JWT + *out = make([]JWTAuthenticator, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthenticationConfiguration. +func (in *AuthenticationConfiguration) DeepCopy() *AuthenticationConfiguration { + if in == nil { + return nil + } + out := new(AuthenticationConfiguration) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *AuthenticationConfiguration) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClaimMappings) DeepCopyInto(out *ClaimMappings) { + *out = *in + in.Username.DeepCopyInto(&out.Username) + in.Groups.DeepCopyInto(&out.Groups) + out.UID = in.UID + if in.Extra != nil { + in, out := &in.Extra, &out.Extra + *out = make([]ExtraMapping, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClaimMappings. +func (in *ClaimMappings) DeepCopy() *ClaimMappings { + if in == nil { + return nil + } + out := new(ClaimMappings) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClaimOrExpression) DeepCopyInto(out *ClaimOrExpression) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClaimOrExpression. +func (in *ClaimOrExpression) DeepCopy() *ClaimOrExpression { + if in == nil { + return nil + } + out := new(ClaimOrExpression) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClaimValidationRule) DeepCopyInto(out *ClaimValidationRule) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClaimValidationRule. +func (in *ClaimValidationRule) DeepCopy() *ClaimValidationRule { + if in == nil { + return nil + } + out := new(ClaimValidationRule) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClientCredentialConfig) DeepCopyInto(out *ClientCredentialConfig) { + *out = *in + if in.Scopes != nil { + in, out := &in.Scopes, &out.Scopes + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.TLS != nil { + in, out := &in.TLS, &out.TLS + *out = new(TLS) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClientCredentialConfig. +func (in *ClientCredentialConfig) DeepCopy() *ClientCredentialConfig { + if in == nil { + return nil + } + out := new(ClientCredentialConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ExternalClaimsSource) DeepCopyInto(out *ExternalClaimsSource) { + *out = *in + if in.Authentication != nil { + in, out := &in.Authentication, &out.Authentication + *out = new(Authentication) + (*in).DeepCopyInto(*out) + } + if in.TLS != nil { + in, out := &in.TLS, &out.TLS + *out = new(TLS) + (*in).DeepCopyInto(*out) + } + if in.URL != nil { + in, out := &in.URL, &out.URL + *out = new(SourceURL) + (*in).DeepCopyInto(*out) + } + if in.Mappings != nil { + in, out := &in.Mappings, &out.Mappings + *out = make([]SourcedClaimMapping, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ExternalSourceCondition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalClaimsSource. +func (in *ExternalClaimsSource) DeepCopy() *ExternalClaimsSource { + if in == nil { + return nil + } + out := new(ExternalClaimsSource) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ExternalSourceCondition) DeepCopyInto(out *ExternalSourceCondition) { + *out = *in + if in.Expression != nil { + in, out := &in.Expression, &out.Expression + *out = new(string) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalSourceCondition. +func (in *ExternalSourceCondition) DeepCopy() *ExternalSourceCondition { + if in == nil { + return nil + } + out := new(ExternalSourceCondition) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ExtraMapping) DeepCopyInto(out *ExtraMapping) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExtraMapping. +func (in *ExtraMapping) DeepCopy() *ExtraMapping { + if in == nil { + return nil + } + out := new(ExtraMapping) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Issuer) DeepCopyInto(out *Issuer) { + *out = *in + if in.Audiences != nil { + in, out := &in.Audiences, &out.Audiences + *out = make([]string, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Issuer. +func (in *Issuer) DeepCopy() *Issuer { + if in == nil { + return nil + } + out := new(Issuer) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *JWTAuthenticator) DeepCopyInto(out *JWTAuthenticator) { + *out = *in + if in.Issuer != nil { + in, out := &in.Issuer, &out.Issuer + *out = new(Issuer) + (*in).DeepCopyInto(*out) + } + if in.ClaimValidationRules != nil { + in, out := &in.ClaimValidationRules, &out.ClaimValidationRules + *out = make([]ClaimValidationRule, len(*in)) + copy(*out, *in) + } + if in.ClaimMappings != nil { + in, out := &in.ClaimMappings, &out.ClaimMappings + *out = new(ClaimMappings) + (*in).DeepCopyInto(*out) + } + if in.UserValidationRules != nil { + in, out := &in.UserValidationRules, &out.UserValidationRules + *out = make([]UserValidationRule, len(*in)) + copy(*out, *in) + } + if in.ExternalClaimsSources != nil { + in, out := &in.ExternalClaimsSources, &out.ExternalClaimsSources + *out = make([]ExternalClaimsSource, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JWTAuthenticator. +func (in *JWTAuthenticator) DeepCopy() *JWTAuthenticator { + if in == nil { + return nil + } + out := new(JWTAuthenticator) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PrefixedClaimOrExpression) DeepCopyInto(out *PrefixedClaimOrExpression) { + *out = *in + if in.Prefix != nil { + in, out := &in.Prefix, &out.Prefix + *out = new(string) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PrefixedClaimOrExpression. +func (in *PrefixedClaimOrExpression) DeepCopy() *PrefixedClaimOrExpression { + if in == nil { + return nil + } + out := new(PrefixedClaimOrExpression) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *SourceURL) DeepCopyInto(out *SourceURL) { + *out = *in + if in.Hostname != nil { + in, out := &in.Hostname, &out.Hostname + *out = new(string) + **out = **in + } + if in.PathExpression != nil { + in, out := &in.PathExpression, &out.PathExpression + *out = new(string) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SourceURL. +func (in *SourceURL) DeepCopy() *SourceURL { + if in == nil { + return nil + } + out := new(SourceURL) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *SourcedClaimMapping) DeepCopyInto(out *SourcedClaimMapping) { + *out = *in + if in.Name != nil { + in, out := &in.Name, &out.Name + *out = new(string) + **out = **in + } + if in.Expression != nil { + in, out := &in.Expression, &out.Expression + *out = new(string) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SourcedClaimMapping. +func (in *SourcedClaimMapping) DeepCopy() *SourcedClaimMapping { + if in == nil { + return nil + } + out := new(SourcedClaimMapping) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TLS) DeepCopyInto(out *TLS) { + *out = *in + if in.CertificateAuthority != nil { + in, out := &in.CertificateAuthority, &out.CertificateAuthority + *out = new(string) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS. +func (in *TLS) DeepCopy() *TLS { + if in == nil { + return nil + } + out := new(TLS) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *UserValidationRule) DeepCopyInto(out *UserValidationRule) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserValidationRule. +func (in *UserValidationRule) DeepCopy() *UserValidationRule { + if in == nil { + return nil + } + out := new(UserValidationRule) + in.DeepCopyInto(out) + return out +} diff --git a/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.model_name.go b/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.model_name.go new file mode 100644 index 0000000000..634c691fc7 --- /dev/null +++ b/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.model_name.go @@ -0,0 +1,86 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +// Code generated by codegen. DO NOT EDIT. + +package v1alpha1 + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in Authentication) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.Authentication" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in AuthenticationConfiguration) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.AuthenticationConfiguration" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ClaimMappings) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.ClaimMappings" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ClaimOrExpression) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.ClaimOrExpression" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ClaimValidationRule) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.ClaimValidationRule" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ClientCredentialConfig) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.ClientCredentialConfig" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ExternalClaimsSource) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.ExternalClaimsSource" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ExternalSourceCondition) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.ExternalSourceCondition" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ExtraMapping) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.ExtraMapping" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in Issuer) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.Issuer" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in JWTAuthenticator) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.JWTAuthenticator" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in PrefixedClaimOrExpression) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.PrefixedClaimOrExpression" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in SourceURL) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.SourceURL" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in SourcedClaimMapping) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.SourcedClaimMapping" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in TLS) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.TLS" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in UserValidationRule) OpenAPIModelName() string { + return "com.github.openshift.api.authentication.v1alpha1.UserValidationRule" +} diff --git a/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.swagger_doc_generated.go new file mode 100644 index 0000000000..3bd0f4a91a --- /dev/null +++ b/vendor/github.com/openshift/api/authentication/v1alpha1/zz_generated.swagger_doc_generated.go @@ -0,0 +1,188 @@ +package v1alpha1 + +// This file contains a collection of methods that can be used from go-restful to +// generate Swagger API documentation for its models. Please read this PR for more +// information on the implementation: https://github.com/emicklei/go-restful/pull/215 +// +// TODOs are ignored from the parser (e.g. TODO(andronat):... || TODO:...) if and only if +// they are on one line! For multiple line or blocks that you want to ignore use ---. +// Any context after a --- is ignored. +// +// Those methods can be generated by using hack/update-swagger-docs.sh + +// AUTO-GENERATED FUNCTIONS START HERE +var map_Authentication = map[string]string{ + "": "Authentication configures how the apiserver should attempt to authenticate with an external claims source.", + "type": "type is a required field that sets the type of authentication method used by the authenticator when fetching external claims.\n\nAllowed values are 'RequestProvidedToken' and 'ClientCredential'.\n\nWhen set to 'RequestProvidedToken', the authenticator will use the token provided to the kube-apiserver as part of the request to authenticate with the external claims source.\n\nWhen set to 'ClientCredential', the authenticator will use the configured client-id, client-secret, and token endpoint to fetch an access token using the OAuth2 client credentials grant flow. The fetched access token will then be used to authenticate with the external claims source.", + "clientCredential": "clientCredential configures the client credentials and token endpoint to use to get an access token. This field must be set when type is ClientCredential. This field must not be set when type is not ClientCredential.", +} + +func (Authentication) SwaggerDoc() map[string]string { + return map_Authentication +} + +var map_AuthenticationConfiguration = map[string]string{ + "": "AuthenticationConfiguration is the configuration-file API read by the oauth-apiserver when it runs in External OIDC mode.\n\nThe cluster-authentication-operator is the only component that writes this configuration file. It generates the file from the user-facing config.openshift.io/v1, Kind=Authentication API. This type is not a CRD and must not be configured directly.\n\nThe oauth-apiserver performs semantic validation when it reads this file. See https://github.com/openshift/oauth-apiserver/blob/97a820bd5412/pkg/externaloidc/apis/authentication/validation/validation.go.\n\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "jwt": "jwt is a list of authenticator to authenticate Kubernetes users using JWT compliant tokens. The authenticator will attempt to parse a raw ID token, verify it's been signed by the configured issuer. The public key to verify the signature is discovered from the issuer's public endpoint using OIDC discovery. For an incoming token, each JWT authenticator will be attempted in the order in which it is specified in this list. Note however that other authenticators may run before or after the JWT authenticators. The specific position of JWT authenticators in relation to other authenticators is neither defined nor stable across releases. Since each JWT authenticator must have a unique issuer URL, at most one JWT authenticator will attempt to cryptographically validate the token.\n\nThe minimum valid JWT payload must contain the following claims: {\n\t\t\"iss\": \"https://issuer.example.com\",\n\t\t\"aud\": [\"audience\"],\n\t\t\"exp\": 1234567890,\n\t\t\"\": \"username\"\n}", +} + +func (AuthenticationConfiguration) SwaggerDoc() map[string]string { + return map_AuthenticationConfiguration +} + +var map_ClaimMappings = map[string]string{ + "": "ClaimMappings provides the configuration for claim mapping", + "username": "username represents an option for the username attribute. The claim's value must be a singular string. Same as the --oidc-username-claim and --oidc-username-prefix flags. If username.expression is set, the expression must produce a string value. If username.expression uses 'claims.email', then 'claims.email_verified' must be used in username.expression or extra[*].valueExpression or claimValidationRules[*].expression. An example claim validation rule expression that matches the validation automatically applied when username.claim is set to 'email' is 'claims.?email_verified.orValue(true) == true'. By explicitly comparing the value to true, we let type-checking see the result will be a boolean, and to make sure a non-boolean email_verified claim will be caught at runtime.\n\nIn the flag based approach, the --oidc-username-claim and --oidc-username-prefix are optional. If --oidc-username-claim is not set, the default value is \"sub\". For the authentication config, there is no defaulting for claim or prefix. The claim and prefix must be set explicitly. For claim, if --oidc-username-claim was not set with legacy flag approach, configure username.claim=\"sub\" in the authentication config. For prefix:\n (1) --oidc-username-prefix=\"-\", no prefix was added to the username. For the same behavior using authentication config,\n set username.prefix=\"\"\n (2) --oidc-username-prefix=\"\" and --oidc-username-claim != \"email\", prefix was \"#\". For the same\n behavior using authentication config, set username.prefix=\"#\"\n (3) --oidc-username-prefix=\"\". For the same behavior using authentication config, set username.prefix=\"\"", + "groups": "groups represents an option for the groups attribute. The claim's value must be a string or string array claim. If groups.claim is set, the prefix must be specified (and can be the empty string). If groups.expression is set, the expression must produce a string or string array value.\n \"\", [], and null values are treated as the group mapping not being present.", + "uid": "uid represents an option for the uid attribute. Claim must be a singular string claim. If uid.expression is set, the expression must produce a string value.", + "extra": "extra represents an option for the extra attribute. expression must produce a string or string array value. If the value is empty, the extra mapping will not be present.\n\nhard-coded extra key/value - key: \"foo\"\n valueExpression: \"'bar'\"\nThis will result in an extra attribute - foo: [\"bar\"]\n\nhard-coded key, value copying claim value - key: \"foo\"\n valueExpression: \"claims.some_claim\"\nThis will result in an extra attribute - foo: [value of some_claim]\n\nhard-coded key, value derived from claim value - key: \"admin\"\n valueExpression: '(has(claims.is_admin) && claims.is_admin) ? \"true\":\"\"'\nThis will result in:\n - if is_admin claim is present and true, extra attribute - admin: [\"true\"]\n - if is_admin claim is present and false or is_admin claim is not present, no extra attribute will be added", +} + +func (ClaimMappings) SwaggerDoc() map[string]string { + return map_ClaimMappings +} + +var map_ClaimOrExpression = map[string]string{ + "": "ClaimOrExpression provides the configuration for a single claim or expression.", + "claim": "claim is the JWT claim to use. Either claim or expression must be set. Mutually exclusive with expression.", + "expression": "expression represents the expression which will be evaluated by CEL.\n\nCEL expressions have access to the contents of the token claims, organized into CEL variable: - 'claims' is a map of claim names to claim values.\n For example, a variable named 'sub' can be accessed as 'claims.sub'.\n Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'.\n\nDocumentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/\n\nMutually exclusive with claim.", +} + +func (ClaimOrExpression) SwaggerDoc() map[string]string { + return map_ClaimOrExpression +} + +var map_ClaimValidationRule = map[string]string{ + "": "ClaimValidationRule provides the configuration for a single claim validation rule.", + "claim": "claim is the name of a required claim. Same as --oidc-required-claim flag. Only string claim keys are supported. Mutually exclusive with expression and message.", + "requiredValue": "requiredValue is the value of a required claim. Same as --oidc-required-claim flag. Only string claim values are supported. If claim is set and requiredValue is not set, the claim must be present with a value set to the empty string. Mutually exclusive with expression and message.", + "expression": "expression represents the expression which will be evaluated by CEL. Must produce a boolean.\n\nCEL expressions have access to the contents of the token claims, organized into CEL variable: - 'claims' is a map of claim names to claim values.\n For example, a variable named 'sub' can be accessed as 'claims.sub'.\n Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'.\nMust return true for the validation to pass.\n\nDocumentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/\n\nMutually exclusive with claim and requiredValue.", + "message": "message customizes the returned error message when expression returns false. message is a literal string. Mutually exclusive with claim and requiredValue.", +} + +func (ClaimValidationRule) SwaggerDoc() map[string]string { + return map_ClaimValidationRule +} + +var map_ClientCredentialConfig = map[string]string{ + "": "ClientCredentialConfig configures the client credentials and token endpoint to use to get an access token via the OAuth2 client credentials grant flow.", + "clientID": "clientID is the client identifier to use during the OAuth2 client credentials flow. clientID must not be an empty string (\"\"). clientID must only contain printable ASCII characters.", + "clientSecret": "clientSecret is the client secret to use during the OAuth2 client credentials flow. clientSecret is the literal string value of the client secret. clientSecret must not be an empty string (\"\"). clientSecret must only contain printable ASCII characters.", + "tokenEndpoint": "tokenEndpoint is a required URL to query for an access token using the client credential OAuth2 flow. tokenEndpoint must not be an empty string (\"\"). tokenEndpoint must be a valid HTTPS URL. tokenEndpoint must have a host and a path. tokenEndpoint must not contain query parameters, fragments, or user information (e.g., \"user:password@host\").", + "scopes": "scopes is an optional list of OAuth2 scopes to request when obtaining an access token. If not specified, the token endpoint's default scopes will be used. Each scope must not be an empty string (\"\").", + "tls": "tls is an optional field that configures the http client TLS settings when fetching an access token for this source. At least one subfield must be set when this field is specified.", +} + +func (ClientCredentialConfig) SwaggerDoc() map[string]string { + return map_ClientCredentialConfig +} + +var map_ExternalClaimsSource = map[string]string{ + "": "ExternalClaimsSource provides the configuration for a single external claim source.", + "authentication": "authentication is an optional field that configures how the apiserver authenticates with an external claims source. When not specified, anonymous authentication is used.", + "tls": "tls is an optional field that configures the http client TLS settings when fetching external claims from this source. At least one subfield must be set when this field is specified.", + "url": "url is a required configuration of the URL for which the external claims are located.", + "mappings": "mappings is a required list of the claim and response handling expression pairs that produces the claims from the external source.\n\nmappings must have at least 1 entry and must not exceed 16 entries. Entries must have a unique name across all external claim sources.\n\nWARNING: claims sourced using these mappings will override any claims that exist within the token during the claim-to-identity mapping process. Use caution when sourcing external claims to avoid unintentionally overriding token claims. To help guard against this, sourcing external claims can have guard conditions defined in the 'conditions' field.", + "conditions": "conditions is an optional list of conditions in which claims should attempt to be fetched from this external source. When omitted or empty, claims are always attempted to be fetched from this external source. When specified, all conditions must evaluate to 'true' before claims are attempted to be fetched from this external source. conditions must not exceed 16 entries. Entries must have unique expressions.", +} + +func (ExternalClaimsSource) SwaggerDoc() map[string]string { + return map_ExternalClaimsSource +} + +var map_ExternalSourceCondition = map[string]string{ + "": "ExternalSourceCondition configures a singular condition that must return true before the external source is queried to retrieve external claims.", + "expression": "expression is a required CEL expression that is used to determine whether or not an external source should be used to fetch external claims. The expression must return a boolean value, where true means that the source should be consulted and false means that it should not. Claims from the token used for the request to the kube-apiserver are made available via the `claims` variable. expression must not be an empty string (\"\").", +} + +func (ExternalSourceCondition) SwaggerDoc() map[string]string { + return map_ExternalSourceCondition +} + +var map_ExtraMapping = map[string]string{ + "": "ExtraMapping provides the configuration for a single extra mapping.", + "key": "key is a string to use as the extra attribute key. key must be a domain-prefix path (e.g. example.org/foo). All characters before the first \"/\" must be a valid subdomain as defined by RFC 1123. All characters trailing the first \"/\" must be valid HTTP Path characters as defined by RFC 3986. key must be lowercase. Required to be unique.", + "valueExpression": "valueExpression is a CEL expression to extract extra attribute value. valueExpression must produce a string or string array value. \"\", [], and null values are treated as the extra mapping not being present. Empty string values contained within a string array are filtered out.\n\nCEL expressions have access to the contents of the token claims, organized into CEL variable: - 'claims' is a map of claim names to claim values.\n For example, a variable named 'sub' can be accessed as 'claims.sub'.\n Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'.\n\nDocumentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/", +} + +func (ExtraMapping) SwaggerDoc() map[string]string { + return map_ExtraMapping +} + +var map_Issuer = map[string]string{ + "": "Issuer provides the configuration for an external provider's specific settings.", + "url": "url points to the issuer URL in a format https://url or https://url/path. This must match the \"iss\" claim in the presented JWT, and the issuer returned from discovery. Same value as the --oidc-issuer-url flag. Discovery information is fetched from \"{url}/.well-known/openid-configuration\" unless overridden by discoveryURL. Required to be unique across all JWT authenticators. Note that egress selection configuration is not used for this network connection.", + "discoveryURL": "discoveryURL, if specified, overrides the URL used to fetch discovery information instead of using \"{url}/.well-known/openid-configuration\". The exact value specified is used, so \"/.well-known/openid-configuration\" must be included in discoveryURL if needed.\n\nThe \"issuer\" field in the fetched discovery information must match the \"issuer.url\" field in the AuthenticationConfiguration and will be used to validate the \"iss\" claim in the presented JWT. This is for scenarios where the well-known and jwks endpoints are hosted at a different location than the issuer (such as locally in the cluster).\n\nExample: A discovery url that is exposed using kubernetes service 'oidc' in namespace 'oidc-namespace' and discovery information is available at '/.well-known/openid-configuration'. discoveryURL: \"https://oidc.oidc-namespace/.well-known/openid-configuration\" certificateAuthority is used to verify the TLS connection and the hostname on the leaf certificate must be set to 'oidc.oidc-namespace'.\n\ncurl https://oidc.oidc-namespace/.well-known/openid-configuration (.discoveryURL field) {\n issuer: \"https://oidc.example.com\" (.url field)\n}\n\ndiscoveryURL must be different from url. Required to be unique across all JWT authenticators. Note that egress selection configuration is not used for this network connection.", + "certificateAuthority": "certificateAuthority contains PEM-encoded certificate authority certificates used to validate the connection when fetching discovery information. If unset, the system verifier is used. Same value as the content of the file referenced by the --oidc-ca-file flag.", + "audiences": "audiences is the set of acceptable audiences the JWT must be issued to. At least one of the entries must match the \"aud\" claim in presented JWTs. Same value as the --oidc-client-id flag (though this field supports an array). Required to be non-empty.", + "audienceMatchPolicy": "audienceMatchPolicy defines how the \"audiences\" field is used to match the \"aud\" claim in the presented JWT. Allowed values are: 1. \"MatchAny\" when multiple audiences are specified and 2. empty (or unset) or \"MatchAny\" when a single audience is specified.\n\n- MatchAny: the \"aud\" claim in the presented JWT must match at least one of the entries in the \"audiences\" field. For example, if \"audiences\" is [\"foo\", \"bar\"], the \"aud\" claim in the presented JWT must contain either \"foo\" or \"bar\" (and may contain both).\n\n- \"\": The match policy can be empty (or unset) when a single audience is specified in the \"audiences\" field. The \"aud\" claim in the presented JWT must contain the single audience (and may contain others).\n\nFor more nuanced audience validation, use claimValidationRules.\n example: claimValidationRule[].expression: 'sets.equivalent(claims.aud, [\"bar\", \"foo\", \"baz\"])' to require an exact match.", +} + +func (Issuer) SwaggerDoc() map[string]string { + return map_Issuer +} + +var map_JWTAuthenticator = map[string]string{ + "": "JWTAuthenticator configures one JWT authenticator.", + "issuer": "issuer contains the basic OIDC provider connection options.", + "claimValidationRules": "claimValidationRules are rules that are applied to validate token claims to authenticate users.", + "claimMappings": "claimMappings points claims of a token to be treated as user attributes.", + "userValidationRules": "userValidationRules are rules that are applied to final user before completing authentication. These allow invariants to be applied to incoming identities such as preventing the use of the system: prefix that is commonly used by Kubernetes components. The validation rules are logically ANDed together and must all return true for the validation to pass.", + "externalClaimsSources": "externalClaimsSources is an optional field that can be used to configure sources, external to the token provided in a request, in which claims should be fetched from and made available to the claim mapping process that is used to build the identity of a token holder. For example, fetching additional user metadata from an OIDC provider's UserInfo endpoint. externalClaimsSources must not exceed 5 entries.", +} + +func (JWTAuthenticator) SwaggerDoc() map[string]string { + return map_JWTAuthenticator +} + +var map_PrefixedClaimOrExpression = map[string]string{ + "": "PrefixedClaimOrExpression provides the configuration for a single prefixed claim or expression.", + "claim": "claim is the JWT claim to use. Mutually exclusive with expression.", + "prefix": "prefix is prepended to claim's value to prevent clashes with existing names. prefix needs to be set if claim is set and can be the empty string. Mutually exclusive with expression.", + "expression": "expression represents the expression which will be evaluated by CEL.\n\nCEL expressions have access to the contents of the token claims, organized into CEL variable: - 'claims' is a map of claim names to claim values.\n For example, a variable named 'sub' can be accessed as 'claims.sub'.\n Nested claims can be accessed using dot notation, e.g. 'claims.foo.bar'.\n\nDocumentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/\n\nMutually exclusive with claim and prefix.", +} + +func (PrefixedClaimOrExpression) SwaggerDoc() map[string]string { + return map_PrefixedClaimOrExpression +} + +var map_SourceURL = map[string]string{ + "": "SourceURL configures the options used to build the URL that is queried for external claims.", + "hostname": "hostname is a required hostname for which the external claims are located. It must be a valid DNS subdomain name as per RFC1123. This means that it must start and end with a lowercase alphanumeric character, must only consist of lowercase alphanumeric characters, '-', and '.'. hostname must not be an empty string (\"\") and must not exceed 253 characters in length. hostname may optionally specify a port in the format ':{port}'.", + "pathExpression": "pathExpression is a required CEL expression that returns a list of string values used to construct the URL path. Claims from the token used for the request to the kube-apiserver are made available via the `claims` variable. expression must not be an empty string (\"\").", +} + +func (SourceURL) SwaggerDoc() map[string]string { + return map_SourceURL +} + +var map_SourcedClaimMapping = map[string]string{ + "": "SourcedClaimMapping configures the mapping behavior for a single external claim from the response the apiserver received from the external claim source.", + "name": "name is a required name of the claim that will be produced and made available during the claim-to-identity mapping process. name must consist of only lowercase alpha characters and underscores ('_'). name must not be an empty string (\"\") and must not exceed 256 characters in length.", + "expression": "expression is a required CEL expression that will produce a value to be assigned to the claim. The full response body from the request to the external claim source is provided via the `response` variable. expression must not be an empty string (\"\").", +} + +func (SourcedClaimMapping) SwaggerDoc() map[string]string { + return map_SourcedClaimMapping +} + +var map_TLS = map[string]string{ + "": "TLS configures the TLS options that the apiserver uses as a client when making a request to the external claim source. At least one field must be set when specified.", + "certificateAuthority": "certificateAuthority is an optional field that configures the certificate authority used to validate TLS connections with the external claims source. Must not be empty and must be a valid PEM-encoded certificate.", +} + +func (TLS) SwaggerDoc() map[string]string { + return map_TLS +} + +var map_UserValidationRule = map[string]string{ + "": "UserValidationRule provides the configuration for a single user info validation rule.", + "expression": "expression represents the expression which will be evaluated by CEL. Must return true for the validation to pass.\n\nCEL expressions have access to the contents of UserInfo, organized into CEL variable: - 'user' - authentication.k8s.io/v1, Kind=UserInfo object\n Refer to https://github.com/kubernetes/api/blob/release-1.28/authentication/v1/types.go#L105-L122 for the definition.\n API documentation: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#userinfo-v1-authentication-k8s-io\n\nDocumentation on CEL: https://kubernetes.io/docs/reference/using-api/cel/", + "message": "message customizes the returned error message when rule returns false. message is a literal string.", +} + +func (UserValidationRule) SwaggerDoc() map[string]string { + return map_UserValidationRule +} + +// AUTO-GENERATED FUNCTIONS END HERE diff --git a/vendor/github.com/openshift/api/config/v1alpha1/register.go b/vendor/github.com/openshift/api/config/v1alpha1/register.go index 1d84b71079..6b5941a735 100644 --- a/vendor/github.com/openshift/api/config/v1alpha1/register.go +++ b/vendor/github.com/openshift/api/config/v1alpha1/register.go @@ -40,6 +40,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &CRIOCredentialProviderConfigList{}, &PKI{}, &PKIList{}, + &ControllerManager{}, + &ControllerManagerList{}, ) metav1.AddToGroupVersion(scheme, GroupVersion) return nil diff --git a/vendor/github.com/openshift/api/config/v1alpha1/types_controllermanager.go b/vendor/github.com/openshift/api/config/v1alpha1/types_controllermanager.go new file mode 100644 index 0000000000..d85faad066 --- /dev/null +++ b/vendor/github.com/openshift/api/config/v1alpha1/types_controllermanager.go @@ -0,0 +1,92 @@ +package v1alpha1 + +import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + +// +genclient +// +genclient:nonNamespaced +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// ControllerManager holds cluster-wide configuration shared by the controller managers +// in the system, among them especially kube-controller-manager. +// The resource is a singleton named "cluster". +// +// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. +// +openshift:compatibility-gen:level=4 +// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2668 +// +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01 +// +kubebuilder:object:root=true +// +kubebuilder:resource:path=controllermanagers,scope=Cluster +// +openshift:enable:FeatureGate=ControllerManagerConfig +// +kubebuilder:validation:XValidation:rule="self.metadata.name == 'cluster'",message="controllermanager is a singleton, .metadata.name must be 'cluster'" +type ControllerManager struct { + metav1.TypeMeta `json:",inline"` + + // metadata is the standard object's metadata. + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + // +optional + metav1.ObjectMeta `json:"metadata,omitzero"` + // spec holds user settable values for configuration. + // This field is required but the spec may be empty to express no opinion. + // +required + Spec *ControllerManagerSpec `json:"spec,omitempty,omitzero"` +} + +// ControllerManagerSpec defines the desired state of the controller managers +// +kubebuilder:validation:MinProperties=0 +type ControllerManagerSpec struct { + // volumeForceDetach controls the conditions under which kube-controller-manager + // force detaches volumes from a node that is not healthy. + // Volumes are always force detached when a node is marked out-of-service via the + // "node.kubernetes.io/out-of-service" taint, as part of the non-graceful node + // shutdown procedure. This field controls whether force detach is also triggered + // when the maximum unmount time is exceeded (6 minutes). + // Valid values are "OnUnmountTimeout" and "OnOutOfServiceTaintOnly". + // When set to "OnUnmountTimeout", volumes are force detached from unhealthy nodes + // once the maximum unmount time is exceeded, so that workloads using them can start + // on other nodes. Force detaching a volume that is still in use by the node can + // corrupt its data. + // When set to "OnOutOfServiceTaintOnly", volumes are force detached only via the + // out-of-service taint, and remain attached to an unhealthy node until it recovers + // or the "node.kubernetes.io/out-of-service" taint is applied as part of the + // non-graceful node shutdown procedure. + // When omitted, this means the user has no opinion and the platform is left + // to choose a reasonable default, which is subject to change over time. + // The current default is "OnUnmountTimeout". + // Changing this field causes kube-controller-manager to be redeployed with the new setting. + // Rollout progress is reported by the kube-controller-manager cluster operator. + // +optional + VolumeForceDetach VolumeForceDetachPolicy `json:"volumeForceDetach,omitempty"` +} + +// VolumeForceDetachPolicy describes the conditions under which volumes are +// force detached from an unhealthy node. +// Valid values are "OnUnmountTimeout" and "OnOutOfServiceTaintOnly". +// +enum +// +kubebuilder:validation:Enum=OnUnmountTimeout;OnOutOfServiceTaintOnly +type VolumeForceDetachPolicy string + +const ( + // VolumeForceDetachOnUnmountTimeout force detaches volumes from unhealthy nodes + // once the maximum unmount time is exceeded. + VolumeForceDetachOnUnmountTimeout VolumeForceDetachPolicy = "OnUnmountTimeout" + // VolumeForceDetachOnOutOfServiceTaintOnly force detaches volumes only when + // the node is marked out-of-service, never based on the maximum unmount time. + VolumeForceDetachOnOutOfServiceTaintOnly VolumeForceDetachPolicy = "OnOutOfServiceTaintOnly" +) + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// ControllerManagerList is a collection of ControllerManager resources. +// +// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. +// +openshift:compatibility-gen:level=4 +type ControllerManagerList struct { + metav1.TypeMeta `json:",inline"` + + // metadata is the standard list's metadata. + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + metav1.ListMeta `json:"metadata"` + + // items is a list of ControllerManager resources + Items []ControllerManager `json:"items"` +} diff --git a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go index 598f38fc5d..851bcb36dc 100644 --- a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go @@ -499,6 +499,86 @@ func (in *ContainerResource) DeepCopy() *ContainerResource { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ControllerManager) DeepCopyInto(out *ControllerManager) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + if in.Spec != nil { + in, out := &in.Spec, &out.Spec + *out = new(ControllerManagerSpec) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ControllerManager. +func (in *ControllerManager) DeepCopy() *ControllerManager { + if in == nil { + return nil + } + out := new(ControllerManager) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ControllerManager) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ControllerManagerList) DeepCopyInto(out *ControllerManagerList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ControllerManager, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ControllerManagerList. +func (in *ControllerManagerList) DeepCopy() *ControllerManagerList { + if in == nil { + return nil + } + out := new(ControllerManagerList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ControllerManagerList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ControllerManagerSpec) DeepCopyInto(out *ControllerManagerSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ControllerManagerSpec. +func (in *ControllerManagerSpec) DeepCopy() *ControllerManagerSpec { + if in == nil { + return nil + } + out := new(ControllerManagerSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CustomPKIPolicy) DeepCopyInto(out *CustomPKIPolicy) { *out = *in diff --git a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml index b2a1241937..d3dde3b135 100644 --- a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml +++ b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml @@ -68,6 +68,29 @@ clustermonitorings.config.openshift.io: - ClusterMonitoringConfig Version: v1alpha1 +controllermanagers.config.openshift.io: + Annotations: {} + ApprovedPRNumber: https://github.com/openshift/api/pull/2668 + CRDName: controllermanagers.config.openshift.io + Capability: "" + Category: "" + FeatureGates: + - ControllerManagerConfig + FilenameOperatorName: config-operator + FilenameOperatorOrdering: "01" + FilenameRunLevel: "0000_10" + GroupName: config.openshift.io + HasStatus: false + KindName: ControllerManager + Labels: {} + PluralName: controllermanagers + PrinterColumns: [] + Scope: Cluster + ShortNames: null + TopLevelFeatureGates: + - ControllerManagerConfig + Version: v1alpha1 + insightsdatagathers.config.openshift.io: Annotations: {} ApprovedPRNumber: https://github.com/openshift/api/pull/1245 diff --git a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.model_name.go b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.model_name.go index 8159016737..b06cfc70af 100644 --- a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.model_name.go +++ b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.model_name.go @@ -105,6 +105,21 @@ func (in ContainerResource) OpenAPIModelName() string { return "com.github.openshift.api.config.v1alpha1.ContainerResource" } +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ControllerManager) OpenAPIModelName() string { + return "com.github.openshift.api.config.v1alpha1.ControllerManager" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ControllerManagerList) OpenAPIModelName() string { + return "com.github.openshift.api.config.v1alpha1.ControllerManagerList" +} + +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ControllerManagerSpec) OpenAPIModelName() string { + return "com.github.openshift.api.config.v1alpha1.ControllerManagerSpec" +} + // OpenAPIModelName returns the OpenAPI model name for this type. func (in CustomPKIPolicy) OpenAPIModelName() string { return "com.github.openshift.api.config.v1alpha1.CustomPKIPolicy" diff --git a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go index 99d9b5a66f..76bf06d6da 100644 --- a/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go @@ -811,6 +811,35 @@ func (UserDefinedMonitoring) SwaggerDoc() map[string]string { return map_UserDefinedMonitoring } +var map_ControllerManager = map[string]string{ + "": "ControllerManager holds cluster-wide configuration shared by the controller managers in the system, among them especially kube-controller-manager. The resource is a singleton named \"cluster\".\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "spec": "spec holds user settable values for configuration. This field is required but the spec may be empty to express no opinion.", +} + +func (ControllerManager) SwaggerDoc() map[string]string { + return map_ControllerManager +} + +var map_ControllerManagerList = map[string]string{ + "": "ControllerManagerList is a collection of ControllerManager resources.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "metadata": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "items": "items is a list of ControllerManager resources", +} + +func (ControllerManagerList) SwaggerDoc() map[string]string { + return map_ControllerManagerList +} + +var map_ControllerManagerSpec = map[string]string{ + "": "ControllerManagerSpec defines the desired state of the controller managers", + "volumeForceDetach": "volumeForceDetach controls the conditions under which kube-controller-manager force detaches volumes from a node that is not healthy. Volumes are always force detached when a node is marked out-of-service via the \"node.kubernetes.io/out-of-service\" taint, as part of the non-graceful node shutdown procedure. This field controls whether force detach is also triggered when the maximum unmount time is exceeded (6 minutes). Valid values are \"OnUnmountTimeout\" and \"OnOutOfServiceTaintOnly\". When set to \"OnUnmountTimeout\", volumes are force detached from unhealthy nodes once the maximum unmount time is exceeded, so that workloads using them can start on other nodes. Force detaching a volume that is still in use by the node can corrupt its data. When set to \"OnOutOfServiceTaintOnly\", volumes are force detached only via the out-of-service taint, and remain attached to an unhealthy node until it recovers or the \"node.kubernetes.io/out-of-service\" taint is applied as part of the non-graceful node shutdown procedure. When omitted, this means the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is \"OnUnmountTimeout\". Changing this field causes kube-controller-manager to be redeployed with the new setting. Rollout progress is reported by the kube-controller-manager cluster operator.", +} + +func (ControllerManagerSpec) SwaggerDoc() map[string]string { + return map_ControllerManagerSpec +} + var map_CRIOCredentialProviderConfig = map[string]string{ "": "CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is \"cluster\". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout.\n\nThe resource is a singleton named \"cluster\".\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", diff --git a/vendor/github.com/openshift/api/envtest-releases.yaml b/vendor/github.com/openshift/api/envtest-releases.yaml index 4705c327e0..a3a6d729e3 100644 --- a/vendor/github.com/openshift/api/envtest-releases.yaml +++ b/vendor/github.com/openshift/api/envtest-releases.yaml @@ -129,3 +129,16 @@ releases: envtest-v1.36.2-linux-arm64.tar.gz: hash: bbe6810d76c91349cdee6daf65a6a9289010d48ddc2c42d9e163897a927b6ff7de9d0addc75bd54721cfa5048f8aafcac06a950efa59f4a686f037d1386811de selfLink: https://storage.googleapis.com/openshift-kubebuilder-tools/envtest-v1.36.2-linux-arm64.tar.gz + v1.37.1: + envtest-v1.37.1-darwin-amd64.tar.gz: + hash: 97c48c7e57a174b0b2103de2259f264b440b9b2268ca04e9ab41dd0d288a491135eeba95b577bb424deabee6ed21bf8d1bbbd2dd9fa742d38fd77ad90060f0c9 + selfLink: https://storage.googleapis.com/openshift-kubebuilder-tools/envtest-v1.37.1-darwin-amd64.tar.gz + envtest-v1.37.1-darwin-arm64.tar.gz: + hash: 4708ec31158d6d91ed8d53b1285f6fb7ee160f331f1922caa3c6936346684a0f1bc19256a114f39d9ab344500ff3821e9283edeb9f24b3246523708c7476b39a + selfLink: https://storage.googleapis.com/openshift-kubebuilder-tools/envtest-v1.37.1-darwin-arm64.tar.gz + envtest-v1.37.1-linux-amd64.tar.gz: + hash: 5b1bcc7cc8a8f09f1032a41c1455b128d01222d5b87a8c298b3ba3204f625bf2b0d9eaa7603eff2574bc03c53931ef362d961e6f1f7fe6cdc0a3978451ada458 + selfLink: https://storage.googleapis.com/openshift-kubebuilder-tools/envtest-v1.37.1-linux-amd64.tar.gz + envtest-v1.37.1-linux-arm64.tar.gz: + hash: c1131e89f99171893a8849e6d657cbe2429f1f5a8adce2d7499edfc673963f12cc70f8113f0863d13db30beb0455bc60989c9d49494e10a85010a73d09aec64c + selfLink: https://storage.googleapis.com/openshift-kubebuilder-tools/envtest-v1.37.1-linux-arm64.tar.gz diff --git a/vendor/github.com/openshift/api/features.md b/vendor/github.com/openshift/api/features.md index 4be7644795..27b4818a06 100644 --- a/vendor/github.com/openshift/api/features.md +++ b/vendor/github.com/openshift/api/features.md @@ -11,10 +11,10 @@ | MachineAPIOperatorDisableMachineHealthCheckController| | | | | | | | | | MultiArchInstallAzure| | | | | | | | | | ShortCertRotation| | | | | | | | | +| ControllerManagerConfig| | | | Enabled | | | | | | KarpenterOperator| | | | Enabled | | | | | | MutableTopology| | | | Enabled | | | | | | UnifiedClusterManagedDNSAndLB| | | | Enabled | | | | | -| AuthenticationComponentProxy| | | | Enabled | | | | Enabled | | BGPBasedVIPManagement| | | Enabled | Enabled | | | | | | ClusterAPIComputeInstall| | | Enabled | Enabled | | | | | | ClusterAPIControlPlaneInstall| | | Enabled | Enabled | | | | | @@ -33,6 +33,7 @@ | AWSClusterHostedDNS| | | Enabled | Enabled | | | Enabled | Enabled | | AWSDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled | | AWSEuropeanSovereignCloudInstall| | | Enabled | Enabled | | | Enabled | Enabled | +| AuthenticationComponentProxy| | Enabled | | Enabled | | Enabled | | Enabled | | AutomatedEtcdBackup| | | Enabled | Enabled | | | Enabled | Enabled | | AzureDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled | | AzureDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled | @@ -72,6 +73,7 @@ | IngressComponentRouteLabels| | | Enabled | Enabled | | | Enabled | Enabled | | IngressControllerLBSecurityGroupsAWS| | | Enabled | Enabled | | | Enabled | Enabled | | KMSEncryption| | | Enabled | Enabled | | | Enabled | Enabled | +| MACSecurity| | | Enabled | Enabled | | | Enabled | Enabled | | MachineAPIMigration| | | Enabled | Enabled | | | Enabled | Enabled | | MachineAPIMigrationAWS| | | Enabled | Enabled | | | Enabled | Enabled | | MachineAPIMigrationOpenStack| | | Enabled | Enabled | | | Enabled | Enabled | diff --git a/vendor/github.com/openshift/api/features/features.go b/vendor/github.com/openshift/api/features/features.go index 3aa8c4514d..d3c91231ea 100644 --- a/vendor/github.com/openshift/api/features/features.go +++ b/vendor/github.com/openshift/api/features/features.go @@ -194,6 +194,14 @@ var ( enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() + FeatureGateMACSecurity = newFeatureGate("MACSecurity"). + reportProblemsToJiraComponent("Networking/ovn-kubernetes"). + contactPerson("jcaamano"). + productScope(ocpSpecific). + enhancementPR("https://github.com/ovn-kubernetes/ovn-kubernetes/pull/6528"). + enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + mustRegister() + FeatureGateBackendQuotaGiB = newFeatureGate("EtcdBackendQuota"). reportProblemsToJiraComponent("etcd"). contactPerson("hasbro17"). @@ -341,7 +349,7 @@ var ( contactPerson("liouk"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/2015"). - enable(inClusterProfile(SelfManaged), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inClusterProfile(SelfManaged), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateExternalOIDCWithAdditionalClaimMappings = newFeatureGate("ExternalOIDCWithUIDAndExtraClaimMappings"). @@ -1074,4 +1082,12 @@ var ( productScope(kubernetes). enhancementPR("https://github.com/kubernetes/enhancements/issues/5055"). mustRegister() + + FeatureGateControllerManagerConfig = newFeatureGate("ControllerManagerConfig"). + reportProblemsToJiraComponent("kube-controller-manager"). + contactPerson("jdobson"). + productScope(ocpSpecific). + enhancementPR("https://github.com/openshift/enhancements/pull/2095"). + enable(inClusterProfile(SelfManaged), inDevPreviewNoUpgrade()). + mustRegister() ) diff --git a/vendor/github.com/openshift/api/install.go b/vendor/github.com/openshift/api/install.go index 6efcc1c298..16b03da720 100644 --- a/vendor/github.com/openshift/api/install.go +++ b/vendor/github.com/openshift/api/install.go @@ -47,6 +47,7 @@ import ( "github.com/openshift/api/apiextensions" "github.com/openshift/api/apiserver" "github.com/openshift/api/apps" + "github.com/openshift/api/authentication" "github.com/openshift/api/authorization" "github.com/openshift/api/build" "github.com/openshift/api/cloudnetwork" @@ -85,6 +86,7 @@ var ( apiextensions.Install, apiserver.Install, apps.Install, + authentication.Install, authorization.Install, build.Install, config.Install, diff --git a/vendor/github.com/openshift/api/operator/v1/types_console.go b/vendor/github.com/openshift/api/operator/v1/types_console.go index 35795b2b71..a7bddbc894 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_console.go +++ b/vendor/github.com/openshift/api/operator/v1/types_console.go @@ -60,7 +60,7 @@ type ConsoleSpec struct { // This field is intended for clusters without ingress capability, // where access to routes is not possible. // +optional - Ingress Ingress `json:"ingress"` + Ingress ConsoleIngress `json:"ingress"` } // ConsoleConfigRoute holds information on external route access to console. @@ -559,7 +559,7 @@ const ( ) // Ingress allows cluster admin to configure alternative ingress for the console. -type Ingress struct { +type ConsoleIngress struct { // consoleURL is a URL to be used as the base console address. // If not specified, the console route hostname will be used. // This field is required for clusters without ingress capability, diff --git a/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go b/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go index 51a981b716..637a7888db 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go +++ b/vendor/github.com/openshift/api/operator/v1/types_kmsencryption.go @@ -142,6 +142,7 @@ const ( // KMSPreflightResult contains the outcome of a preflight validation. // // +openshift:compatibility-gen:level=1 +// +kubebuilder:validation:XValidation:rule="self.status != 'Succeeded' || has(self.remoteKeyID)",message="remoteKeyID is required when status is Succeeded" type KMSPreflightResult struct { // status indicates the outcome of the preflight check. // Succeeded means the KMS plugin responded to Status, Encrypt, and @@ -163,9 +164,12 @@ type KMSPreflightResult struct { // remoteKeyID is the remote key encryption key identifier from KMS v2 // StatusResponse.key_id. This is not a cryptographic key, but a unique // representation of the remote key used to encrypt data. - // The value must be between 1 and 1024 characters. + // When omitted, no remote key identifier is available. This is expected + // when status is Failed, for example when the KMS provider could not be + // reached. When status is Succeeded, remoteKeyID is required. + // When set, the value must be between 1 and 1024 characters. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:MaxLength=1024 - // +required + // +optional RemoteKeyID string `json:"remoteKeyID,omitempty"` } diff --git a/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go b/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go index 112eb85dec..e016d654e8 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go +++ b/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go @@ -22,9 +22,9 @@ import ( // +kubebuilder:validation:XValidation:rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?spec.managedBootImages.machineManagers.hasValue()) || !self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'machine.openshift.io') || self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'machine.openshift.io' && m.selection.mode == 'All') : true",message="when skew enforcement is in Automatic mode, any MachineAPI MachineSet MachineManager must use selection mode 'All'" // +kubebuilder:validation:XValidation:rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinesets' && m.apiGroup == 'machine.openshift.io'): true",message="when skew enforcement is in Automatic mode, managedBootImagesStatus must contain a MachineManager opting in all MachineAPI MachineSets" // +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?spec.managedBootImages.machineManagers.hasValue()) || !self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io') || self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io' && m.selection.mode == 'All') : true",message="when skew enforcement is in Automatic mode, any CAPI MachineSet MachineManager must use selection mode 'All'" -// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io'): true",message="when skew enforcement is in Automatic mode, managedBootImagesStatus must contain a MachineManager opting in all CAPI MachineSets" +// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || !self.status.managedBootImagesStatus.machineManagers.exists(m, m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io') || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinesets' && m.apiGroup == 'cluster.x-k8s.io'): true",message="when skew enforcement is in Automatic mode, any CAPI MachineSet MachineManager in managedBootImagesStatus must use selection mode 'All'" // +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?spec.managedBootImages.machineManagers.hasValue()) || !self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinedeployments' && m.apiGroup == 'cluster.x-k8s.io') || self.spec.managedBootImages.machineManagers.exists(m, m.resource == 'machinedeployments' && m.selection.mode == 'All') : true",message="when skew enforcement is in Automatic mode, any CAPI MachineDeployment MachineManager must use selection mode 'All'" -// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinedeployments'): true",message="when skew enforcement is in Automatic mode, managedBootImagesStatus must contain a MachineManager opting in all CAPI MachineDeployments" +// +openshift:validation:FeatureGateAwareXValidation:featureGate=ManagedBootImagesAWSCAPI,rule="self.?status.bootImageSkewEnforcementStatus.mode.orValue(\"\") == 'Automatic' ? !(self.?status.managedBootImagesStatus.machineManagers.hasValue()) || !self.status.managedBootImagesStatus.machineManagers.exists(m, m.resource == 'machinedeployments') || self.status.managedBootImagesStatus.machineManagers.exists(m, m.selection.mode == 'All' && m.resource == 'machinedeployments'): true",message="when skew enforcement is in Automatic mode, any CAPI MachineDeployment MachineManager in managedBootImagesStatus must use selection mode 'All'" type MachineConfiguration struct { metav1.TypeMeta `json:",inline"` diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go index 2d41027451..dea1d5f13e 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go @@ -1112,6 +1112,22 @@ func (in *ConsoleCustomization) DeepCopy() *ConsoleCustomization { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConsoleIngress) DeepCopyInto(out *ConsoleIngress) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleIngress. +func (in *ConsoleIngress) DeepCopy() *ConsoleIngress { + if in == nil { + return nil + } + out := new(ConsoleIngress) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConsoleList) DeepCopyInto(out *ConsoleList) { *out = *in @@ -2198,22 +2214,6 @@ func (in *IPv6OVNKubernetesConfig) DeepCopy() *IPv6OVNKubernetesConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Ingress) DeepCopyInto(out *Ingress) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Ingress. -func (in *Ingress) DeepCopy() *Ingress { - if in == nil { - return nil - } - out := new(Ingress) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IngressController) DeepCopyInto(out *IngressController) { *out = *in diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go index 13ab0c5f6f..f0d9b3a5db 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.go @@ -250,6 +250,11 @@ func (in ConsoleCustomization) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.ConsoleCustomization" } +// OpenAPIModelName returns the OpenAPI model name for this type. +func (in ConsoleIngress) OpenAPIModelName() string { + return "com.github.openshift.api.operator.v1.ConsoleIngress" +} + // OpenAPIModelName returns the OpenAPI model name for this type. func (in ConsoleList) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.ConsoleList" @@ -500,11 +505,6 @@ func (in IPv6OVNKubernetesConfig) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.IPv6OVNKubernetesConfig" } -// OpenAPIModelName returns the OpenAPI model name for this type. -func (in Ingress) OpenAPIModelName() string { - return "com.github.openshift.api.operator.v1.Ingress" -} - // OpenAPIModelName returns the OpenAPI model name for this type. func (in IngressController) OpenAPIModelName() string { return "com.github.openshift.api.operator.v1.IngressController" diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go index 891d75adc2..7131c31f72 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go @@ -306,6 +306,16 @@ func (ConsoleCustomization) SwaggerDoc() map[string]string { return map_ConsoleCustomization } +var map_ConsoleIngress = map[string]string{ + "": "Ingress allows cluster admin to configure alternative ingress for the console.", + "consoleURL": "consoleURL is a URL to be used as the base console address. If not specified, the console route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. Make sure that appropriate ingress is set up at this URL. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", + "clientDownloadsURL": "clientDownloadsURL is a URL to be used as the address to download client binaries. If not specified, the downloads route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", +} + +func (ConsoleIngress) SwaggerDoc() map[string]string { + return map_ConsoleIngress +} + var map_ConsoleList = map[string]string{ "": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "metadata": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", @@ -396,16 +406,6 @@ func (FileReferenceSource) SwaggerDoc() map[string]string { return map_FileReferenceSource } -var map_Ingress = map[string]string{ - "": "Ingress allows cluster admin to configure alternative ingress for the console.", - "consoleURL": "consoleURL is a URL to be used as the base console address. If not specified, the console route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. Make sure that appropriate ingress is set up at this URL. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", - "clientDownloadsURL": "clientDownloadsURL is a URL to be used as the address to download client binaries. If not specified, the downloads route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", -} - -func (Ingress) SwaggerDoc() map[string]string { - return map_Ingress -} - var map_Logo = map[string]string{ "": "Logo defines a configuration based on theme modes for the console UI logo.", "type": "type specifies the type of the logo for the console UI. It determines whether the logo is for the masthead or favicon. type is a required field that allows values of Masthead and Favicon. When set to \"Masthead\", the logo will be used in the masthead and about modal of the console UI. When set to \"Favicon\", the logo will be used as the favicon of the console UI.", @@ -1426,7 +1426,7 @@ var map_KMSPreflightResult = map[string]string{ "": "KMSPreflightResult contains the outcome of a preflight validation.", "status": "status indicates the outcome of the preflight check. Succeeded means the KMS plugin responded to Status, Encrypt, and Decrypt calls successfully. Failed means the validation did not pass.", "configHash": "configHash is the hash of the configuration that was validated. This is compared against observedConfigHash to confirm the result corresponds to the current configuration. The value must be exactly 8 characters.", - "remoteKeyID": "remoteKeyID is the remote key encryption key identifier from KMS v2 StatusResponse.key_id. This is not a cryptographic key, but a unique representation of the remote key used to encrypt data. The value must be between 1 and 1024 characters.", + "remoteKeyID": "remoteKeyID is the remote key encryption key identifier from KMS v2 StatusResponse.key_id. This is not a cryptographic key, but a unique representation of the remote key used to encrypt data. When omitted, no remote key identifier is available. This is expected when status is Failed, for example when the KMS provider could not be reached. When status is Succeeded, remoteKeyID is required. When set, the value must be between 1 and 1024 characters.", } func (KMSPreflightResult) SwaggerDoc() map[string]string { diff --git a/vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/controllermanager.go b/vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/controllermanager.go new file mode 100644 index 0000000000..ec889c7aa1 --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/controllermanager.go @@ -0,0 +1,264 @@ +// Code generated by applyconfiguration-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + configv1alpha1 "github.com/openshift/api/config/v1alpha1" + internal "github.com/openshift/client-go/config/applyconfigurations/internal" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + managedfields "k8s.io/apimachinery/pkg/util/managedfields" + v1 "k8s.io/client-go/applyconfigurations/meta/v1" +) + +// ControllerManagerApplyConfiguration represents a declarative configuration of the ControllerManager type for use +// with apply. +// +// ControllerManager holds cluster-wide configuration shared by the controller managers +// in the system, among them especially kube-controller-manager. +// The resource is a singleton named "cluster". +// +// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. +type ControllerManagerApplyConfiguration struct { + v1.TypeMetaApplyConfiguration `json:""` + // metadata is the standard object's metadata. + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + // spec holds user settable values for configuration. + // This field is required but the spec may be empty to express no opinion. + Spec *ControllerManagerSpecApplyConfiguration `json:"spec,omitempty"` +} + +// ControllerManager constructs a declarative configuration of the ControllerManager type for use with +// apply. +func ControllerManager(name string) *ControllerManagerApplyConfiguration { + b := &ControllerManagerApplyConfiguration{} + b.WithName(name) + b.WithKind("ControllerManager") + b.WithAPIVersion("config.openshift.io/v1alpha1") + return b +} + +// ExtractControllerManagerFrom extracts the applied configuration owned by fieldManager from +// controllerManager for the specified subresource. Pass an empty string for subresource to extract +// the main resource. Common subresources include "status", "scale", etc. +// controllerManager must be a unmodified ControllerManager API object that was retrieved from the Kubernetes API. +// ExtractControllerManagerFrom provides a way to perform a extract/modify-in-place/apply workflow. +// Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously +// applied if another fieldManager has updated or force applied any of the previously applied fields. +func ExtractControllerManagerFrom(controllerManager *configv1alpha1.ControllerManager, fieldManager string, subresource string) (*ControllerManagerApplyConfiguration, error) { + b := &ControllerManagerApplyConfiguration{} + err := managedfields.ExtractInto(controllerManager, internal.Parser().Type("com.github.openshift.api.config.v1alpha1.ControllerManager"), fieldManager, b, subresource) + if err != nil { + return nil, err + } + b.WithName(controllerManager.Name) + + b.WithKind("ControllerManager") + b.WithAPIVersion("config.openshift.io/v1alpha1") + return b, nil +} + +// ExtractControllerManager extracts the applied configuration owned by fieldManager from +// controllerManager. If no managedFields are found in controllerManager for fieldManager, a +// ControllerManagerApplyConfiguration is returned with only the Name, Namespace (if applicable), +// APIVersion and Kind populated. It is possible that no managed fields were found for because other +// field managers have taken ownership of all the fields previously owned by fieldManager, or because +// the fieldManager never owned fields any fields. +// controllerManager must be a unmodified ControllerManager API object that was retrieved from the Kubernetes API. +// ExtractControllerManager provides a way to perform a extract/modify-in-place/apply workflow. +// Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously +// applied if another fieldManager has updated or force applied any of the previously applied fields. +func ExtractControllerManager(controllerManager *configv1alpha1.ControllerManager, fieldManager string) (*ControllerManagerApplyConfiguration, error) { + return ExtractControllerManagerFrom(controllerManager, fieldManager, "") +} + +func (b ControllerManagerApplyConfiguration) IsApplyConfiguration() {} + +// WithKind sets the Kind field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Kind field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithKind(value string) *ControllerManagerApplyConfiguration { + b.TypeMetaApplyConfiguration.Kind = &value + return b +} + +// WithAPIVersion sets the APIVersion field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the APIVersion field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithAPIVersion(value string) *ControllerManagerApplyConfiguration { + b.TypeMetaApplyConfiguration.APIVersion = &value + return b +} + +// WithName sets the Name field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Name field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithName(value string) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.Name = &value + return b +} + +// WithGenerateName sets the GenerateName field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the GenerateName field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithGenerateName(value string) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.GenerateName = &value + return b +} + +// WithNamespace sets the Namespace field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Namespace field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithNamespace(value string) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.Namespace = &value + return b +} + +// WithUID sets the UID field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the UID field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithUID(value types.UID) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.UID = &value + return b +} + +// WithResourceVersion sets the ResourceVersion field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the ResourceVersion field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithResourceVersion(value string) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.ResourceVersion = &value + return b +} + +// WithGeneration sets the Generation field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Generation field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithGeneration(value int64) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.Generation = &value + return b +} + +// WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the CreationTimestamp field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value + return b +} + +// WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the DeletionTimestamp field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value + return b +} + +// WithDeletionGracePeriodSeconds sets the DeletionGracePeriodSeconds field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value + return b +} + +// WithLabels puts the entries into the Labels field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, the entries provided by each call will be put on the Labels field, +// overwriting an existing map entries in Labels field with the same key. +func (b *ControllerManagerApplyConfiguration) WithLabels(entries map[string]string) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) + } + for k, v := range entries { + b.ObjectMetaApplyConfiguration.Labels[k] = v + } + return b +} + +// WithAnnotations puts the entries into the Annotations field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, the entries provided by each call will be put on the Annotations field, +// overwriting an existing map entries in Annotations field with the same key. +func (b *ControllerManagerApplyConfiguration) WithAnnotations(entries map[string]string) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) + } + for k, v := range entries { + b.ObjectMetaApplyConfiguration.Annotations[k] = v + } + return b +} + +// WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, values provided by each call will be appended to the OwnerReferences field. +func (b *ControllerManagerApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + for i := range values { + if values[i] == nil { + panic("nil value passed to WithOwnerReferences") + } + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) + } + return b +} + +// WithFinalizers adds the given value to the Finalizers field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, values provided by each call will be appended to the Finalizers field. +func (b *ControllerManagerApplyConfiguration) WithFinalizers(values ...string) *ControllerManagerApplyConfiguration { + b.ensureObjectMetaApplyConfigurationExists() + for i := range values { + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) + } + return b +} + +func (b *ControllerManagerApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { + if b.ObjectMetaApplyConfiguration == nil { + b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + } +} + +// WithSpec sets the Spec field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Spec field is set to the value of the last call. +func (b *ControllerManagerApplyConfiguration) WithSpec(value *ControllerManagerSpecApplyConfiguration) *ControllerManagerApplyConfiguration { + b.Spec = value + return b +} + +// GetKind retrieves the value of the Kind field in the declarative configuration. +func (b *ControllerManagerApplyConfiguration) GetKind() *string { + return b.TypeMetaApplyConfiguration.Kind +} + +// GetAPIVersion retrieves the value of the APIVersion field in the declarative configuration. +func (b *ControllerManagerApplyConfiguration) GetAPIVersion() *string { + return b.TypeMetaApplyConfiguration.APIVersion +} + +// GetName retrieves the value of the Name field in the declarative configuration. +func (b *ControllerManagerApplyConfiguration) GetName() *string { + b.ensureObjectMetaApplyConfigurationExists() + return b.ObjectMetaApplyConfiguration.Name +} + +// GetNamespace retrieves the value of the Namespace field in the declarative configuration. +func (b *ControllerManagerApplyConfiguration) GetNamespace() *string { + b.ensureObjectMetaApplyConfigurationExists() + return b.ObjectMetaApplyConfiguration.Namespace +} diff --git a/vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/controllermanagerspec.go b/vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/controllermanagerspec.go new file mode 100644 index 0000000000..be53e071ae --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/controllermanagerspec.go @@ -0,0 +1,49 @@ +// Code generated by applyconfiguration-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + configv1alpha1 "github.com/openshift/api/config/v1alpha1" +) + +// ControllerManagerSpecApplyConfiguration represents a declarative configuration of the ControllerManagerSpec type for use +// with apply. +// +// ControllerManagerSpec defines the desired state of the controller managers +type ControllerManagerSpecApplyConfiguration struct { + // volumeForceDetach controls the conditions under which kube-controller-manager + // force detaches volumes from a node that is not healthy. + // Volumes are always force detached when a node is marked out-of-service via the + // "node.kubernetes.io/out-of-service" taint, as part of the non-graceful node + // shutdown procedure. This field controls whether force detach is also triggered + // when the maximum unmount time is exceeded (6 minutes). + // Valid values are "OnUnmountTimeout" and "OnOutOfServiceTaintOnly". + // When set to "OnUnmountTimeout", volumes are force detached from unhealthy nodes + // once the maximum unmount time is exceeded, so that workloads using them can start + // on other nodes. Force detaching a volume that is still in use by the node can + // corrupt its data. + // When set to "OnOutOfServiceTaintOnly", volumes are force detached only via the + // out-of-service taint, and remain attached to an unhealthy node until it recovers + // or the "node.kubernetes.io/out-of-service" taint is applied as part of the + // non-graceful node shutdown procedure. + // When omitted, this means the user has no opinion and the platform is left + // to choose a reasonable default, which is subject to change over time. + // The current default is "OnUnmountTimeout". + // Changing this field causes kube-controller-manager to be redeployed with the new setting. + // Rollout progress is reported by the kube-controller-manager cluster operator. + VolumeForceDetach *configv1alpha1.VolumeForceDetachPolicy `json:"volumeForceDetach,omitempty"` +} + +// ControllerManagerSpecApplyConfiguration constructs a declarative configuration of the ControllerManagerSpec type for use with +// apply. +func ControllerManagerSpec() *ControllerManagerSpecApplyConfiguration { + return &ControllerManagerSpecApplyConfiguration{} +} + +// WithVolumeForceDetach sets the VolumeForceDetach field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the VolumeForceDetach field is set to the value of the last call. +func (b *ControllerManagerSpecApplyConfiguration) WithVolumeForceDetach(value configv1alpha1.VolumeForceDetachPolicy) *ControllerManagerSpecApplyConfiguration { + b.VolumeForceDetach = &value + return b +} diff --git a/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go b/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go index ceceb86178..b8aebfbb36 100644 --- a/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go +++ b/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go @@ -4618,6 +4618,28 @@ var schemaYAML = typed.YAMLObject(`types: - name: request type: namedType: io.k8s.apimachinery.pkg.api.resource.Quantity +- name: com.github.openshift.api.config.v1alpha1.ControllerManager + map: + fields: + - name: apiVersion + type: + scalar: string + - name: kind + type: + scalar: string + - name: metadata + type: + namedType: io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta + default: {} + - name: spec + type: + namedType: com.github.openshift.api.config.v1alpha1.ControllerManagerSpec +- name: com.github.openshift.api.config.v1alpha1.ControllerManagerSpec + map: + fields: + - name: volumeForceDetach + type: + scalar: string - name: com.github.openshift.api.config.v1alpha1.CustomPKIPolicy map: fields: diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/config_client.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/config_client.go index 23ba9a19c0..a2945f973f 100644 --- a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/config_client.go +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/config_client.go @@ -15,6 +15,7 @@ type ConfigV1alpha1Interface interface { BackupsGetter CRIOCredentialProviderConfigsGetter ClusterMonitoringsGetter + ControllerManagersGetter InsightsDataGathersGetter PKIsGetter } @@ -36,6 +37,10 @@ func (c *ConfigV1alpha1Client) ClusterMonitorings() ClusterMonitoringInterface { return newClusterMonitorings(c) } +func (c *ConfigV1alpha1Client) ControllerManagers() ControllerManagerInterface { + return newControllerManagers(c) +} + func (c *ConfigV1alpha1Client) InsightsDataGathers() InsightsDataGatherInterface { return newInsightsDataGathers(c) } diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/controllermanager.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/controllermanager.go new file mode 100644 index 0000000000..7a69999f14 --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/controllermanager.go @@ -0,0 +1,54 @@ +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + context "context" + + configv1alpha1 "github.com/openshift/api/config/v1alpha1" + applyconfigurationsconfigv1alpha1 "github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1" + scheme "github.com/openshift/client-go/config/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + gentype "k8s.io/client-go/gentype" +) + +// ControllerManagersGetter has a method to return a ControllerManagerInterface. +// A group's client should implement this interface. +type ControllerManagersGetter interface { + ControllerManagers() ControllerManagerInterface +} + +// ControllerManagerInterface has methods to work with ControllerManager resources. +type ControllerManagerInterface interface { + Create(ctx context.Context, controllerManager *configv1alpha1.ControllerManager, opts v1.CreateOptions) (*configv1alpha1.ControllerManager, error) + Update(ctx context.Context, controllerManager *configv1alpha1.ControllerManager, opts v1.UpdateOptions) (*configv1alpha1.ControllerManager, error) + Delete(ctx context.Context, name string, opts v1.DeleteOptions) error + DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error + Get(ctx context.Context, name string, opts v1.GetOptions) (*configv1alpha1.ControllerManager, error) + List(ctx context.Context, opts v1.ListOptions) (*configv1alpha1.ControllerManagerList, error) + Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *configv1alpha1.ControllerManager, err error) + Apply(ctx context.Context, controllerManager *applyconfigurationsconfigv1alpha1.ControllerManagerApplyConfiguration, opts v1.ApplyOptions) (result *configv1alpha1.ControllerManager, err error) + ControllerManagerExpansion +} + +// controllerManagers implements ControllerManagerInterface +type controllerManagers struct { + *gentype.ClientWithListAndApply[*configv1alpha1.ControllerManager, *configv1alpha1.ControllerManagerList, *applyconfigurationsconfigv1alpha1.ControllerManagerApplyConfiguration] +} + +// newControllerManagers returns a ControllerManagers +func newControllerManagers(c *ConfigV1alpha1Client) *controllerManagers { + return &controllerManagers{ + gentype.NewClientWithListAndApply[*configv1alpha1.ControllerManager, *configv1alpha1.ControllerManagerList, *applyconfigurationsconfigv1alpha1.ControllerManagerApplyConfiguration]( + "controllermanagers", + c.RESTClient(), + scheme.ParameterCodec, + "", + func() *configv1alpha1.ControllerManager { return &configv1alpha1.ControllerManager{} }, + func() *configv1alpha1.ControllerManagerList { return &configv1alpha1.ControllerManagerList{} }, + ), + } +} diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/generated_expansion.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/generated_expansion.go index bc1f603194..b976f5ca38 100644 --- a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/generated_expansion.go +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/generated_expansion.go @@ -8,6 +8,8 @@ type CRIOCredentialProviderConfigExpansion interface{} type ClusterMonitoringExpansion interface{} +type ControllerManagerExpansion interface{} + type InsightsDataGatherExpansion interface{} type PKIExpansion interface{} diff --git a/vendor/github.com/openshift/client-go/config/listers/config/v1alpha1/controllermanager.go b/vendor/github.com/openshift/client-go/config/listers/config/v1alpha1/controllermanager.go new file mode 100644 index 0000000000..6804208464 --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/listers/config/v1alpha1/controllermanager.go @@ -0,0 +1,32 @@ +// Code generated by lister-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + configv1alpha1 "github.com/openshift/api/config/v1alpha1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" +) + +// ControllerManagerLister helps list ControllerManagers. +// All objects returned here must be treated as read-only. +type ControllerManagerLister interface { + // List lists all ControllerManagers in the indexer. + // Objects returned here must be treated as read-only. + List(selector labels.Selector) (ret []*configv1alpha1.ControllerManager, err error) + // Get retrieves the ControllerManager from the index for a given name. + // Objects returned here must be treated as read-only. + Get(name string) (*configv1alpha1.ControllerManager, error) + ControllerManagerListerExpansion +} + +// controllerManagerLister implements the ControllerManagerLister interface. +type controllerManagerLister struct { + listers.ResourceIndexer[*configv1alpha1.ControllerManager] +} + +// NewControllerManagerLister returns a new ControllerManagerLister. +func NewControllerManagerLister(indexer cache.Indexer) ControllerManagerLister { + return &controllerManagerLister{listers.New[*configv1alpha1.ControllerManager](indexer, configv1alpha1.Resource("controllermanager"))} +} diff --git a/vendor/github.com/openshift/client-go/config/listers/config/v1alpha1/expansion_generated.go b/vendor/github.com/openshift/client-go/config/listers/config/v1alpha1/expansion_generated.go index 3baf74bc8b..1e8e405c10 100644 --- a/vendor/github.com/openshift/client-go/config/listers/config/v1alpha1/expansion_generated.go +++ b/vendor/github.com/openshift/client-go/config/listers/config/v1alpha1/expansion_generated.go @@ -14,6 +14,10 @@ type CRIOCredentialProviderConfigListerExpansion interface{} // ClusterMonitoringLister. type ClusterMonitoringListerExpansion interface{} +// ControllerManagerListerExpansion allows custom methods to be added to +// ControllerManagerLister. +type ControllerManagerListerExpansion interface{} + // InsightsDataGatherListerExpansion allows custom methods to be added to // InsightsDataGatherLister. type InsightsDataGatherListerExpansion interface{} diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go index fe01a89953..6856a9f930 100644 --- a/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go @@ -1010,6 +1010,17 @@ var schemaYAML = typed.YAMLObject(`types: type: namedType: com.github.openshift.api.operator.v1.QuickStarts default: {} +- name: com.github.openshift.api.operator.v1.ConsoleIngress + map: + fields: + - name: clientDownloadsURL + type: + scalar: string + default: "" + - name: consoleURL + type: + scalar: string + default: "" - name: com.github.openshift.api.operator.v1.ConsoleProviders map: fields: @@ -1025,7 +1036,7 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: ingress type: - namedType: com.github.openshift.api.operator.v1.Ingress + namedType: com.github.openshift.api.operator.v1.ConsoleIngress default: {} - name: logLevel type: @@ -1757,17 +1768,6 @@ var schemaYAML = typed.YAMLObject(`types: - name: internalTransitSwitchSubnet type: scalar: string -- name: com.github.openshift.api.operator.v1.Ingress - map: - fields: - - name: clientDownloadsURL - type: - scalar: string - default: "" - - name: consoleURL - type: - scalar: string - default: "" - name: com.github.openshift.api.operator.v1.IngressController map: fields: diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ingress.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/consoleingress.go similarity index 75% rename from vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ingress.go rename to vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/consoleingress.go index 11cb5a2377..3bb1ebedf9 100644 --- a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ingress.go +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/consoleingress.go @@ -2,11 +2,11 @@ package v1 -// IngressApplyConfiguration represents a declarative configuration of the Ingress type for use +// ConsoleIngressApplyConfiguration represents a declarative configuration of the ConsoleIngress type for use // with apply. // // Ingress allows cluster admin to configure alternative ingress for the console. -type IngressApplyConfiguration struct { +type ConsoleIngressApplyConfiguration struct { // consoleURL is a URL to be used as the base console address. // If not specified, the console route hostname will be used. // This field is required for clusters without ingress capability, @@ -26,16 +26,16 @@ type IngressApplyConfiguration struct { ClientDownloadsURL *string `json:"clientDownloadsURL,omitempty"` } -// IngressApplyConfiguration constructs a declarative configuration of the Ingress type for use with +// ConsoleIngressApplyConfiguration constructs a declarative configuration of the ConsoleIngress type for use with // apply. -func Ingress() *IngressApplyConfiguration { - return &IngressApplyConfiguration{} +func ConsoleIngress() *ConsoleIngressApplyConfiguration { + return &ConsoleIngressApplyConfiguration{} } // WithConsoleURL sets the ConsoleURL field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the ConsoleURL field is set to the value of the last call. -func (b *IngressApplyConfiguration) WithConsoleURL(value string) *IngressApplyConfiguration { +func (b *ConsoleIngressApplyConfiguration) WithConsoleURL(value string) *ConsoleIngressApplyConfiguration { b.ConsoleURL = &value return b } @@ -43,7 +43,7 @@ func (b *IngressApplyConfiguration) WithConsoleURL(value string) *IngressApplyCo // WithClientDownloadsURL sets the ClientDownloadsURL field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the ClientDownloadsURL field is set to the value of the last call. -func (b *IngressApplyConfiguration) WithClientDownloadsURL(value string) *IngressApplyConfiguration { +func (b *ConsoleIngressApplyConfiguration) WithClientDownloadsURL(value string) *ConsoleIngressApplyConfiguration { b.ClientDownloadsURL = &value return b } diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/consolespec.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/consolespec.go index 104941e94a..2f61414098 100644 --- a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/consolespec.go +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/consolespec.go @@ -34,7 +34,7 @@ type ConsoleSpecApplyConfiguration struct { // ingress allows to configure the alternative ingress for the console. // This field is intended for clusters without ingress capability, // where access to routes is not possible. - Ingress *IngressApplyConfiguration `json:"ingress,omitempty"` + Ingress *ConsoleIngressApplyConfiguration `json:"ingress,omitempty"` } // ConsoleSpecApplyConfiguration constructs a declarative configuration of the ConsoleSpec type for use with @@ -120,7 +120,7 @@ func (b *ConsoleSpecApplyConfiguration) WithPlugins(values ...string) *ConsoleSp // WithIngress sets the Ingress field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Ingress field is set to the value of the last call. -func (b *ConsoleSpecApplyConfiguration) WithIngress(value *IngressApplyConfiguration) *ConsoleSpecApplyConfiguration { +func (b *ConsoleSpecApplyConfiguration) WithIngress(value *ConsoleIngressApplyConfiguration) *ConsoleSpecApplyConfiguration { b.Ingress = value return b } diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machinemanagerselector.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machinemanagerselector.go index 6bee0b9abd..e337689d2b 100644 --- a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machinemanagerselector.go +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machinemanagerselector.go @@ -15,6 +15,8 @@ type MachineManagerSelectorApplyConfiguration struct { // Partial requires specified selector(s) and allows customisation of which resources matched by the machine manager will be updated. // Partial is not permitted for the controlplanemachinesets resource type as they are a singleton within the cluster. // None means that every resource matched by the machine manager will not be updated. + // When boot image skew enforcement is in Automatic mode, only All is permitted for the + // machinesets and machinedeployments resource types, in any API group. Mode *operatorv1.MachineManagerSelectorMode `json:"mode,omitempty"` // partial provides label selector(s) that can be used to match machine management resources. // Only permitted when mode is set to "Partial". diff --git a/vendor/modules.txt b/vendor/modules.txt index 040ad9ee8e..49bb0a5dbd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -465,7 +465,7 @@ github.com/opencontainers/runtime-spec/specs-go github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalkdir -# github.com/openshift/api v0.0.0-20261001152744-764bd4c566f9 +# github.com/openshift/api v0.0.0-20261009034342-f9511d3fcb26 ## explicit; go 1.26.0 github.com/openshift/api github.com/openshift/api/annotations @@ -475,6 +475,8 @@ github.com/openshift/api/apiserver github.com/openshift/api/apiserver/v1 github.com/openshift/api/apps github.com/openshift/api/apps/v1 +github.com/openshift/api/authentication +github.com/openshift/api/authentication/v1alpha1 github.com/openshift/api/authorization github.com/openshift/api/authorization/v1 github.com/openshift/api/build @@ -575,7 +577,7 @@ github.com/openshift/build-machinery-go/make/targets/golang github.com/openshift/build-machinery-go/make/targets/openshift github.com/openshift/build-machinery-go/make/targets/openshift/operator github.com/openshift/build-machinery-go/scripts -# github.com/openshift/client-go v0.0.0-20261001003915-dcaad1dc7fe8 +# github.com/openshift/client-go v0.0.0-20261006222332-348fc1ca8bb1 ## explicit; go 1.26.0 github.com/openshift/client-go/apiserver/applyconfigurations/apiserver/v1 github.com/openshift/client-go/apiserver/applyconfigurations/internal @@ -715,7 +717,7 @@ github.com/openshift/client-go/user/informers/externalversions/internalinterface github.com/openshift/client-go/user/informers/externalversions/user github.com/openshift/client-go/user/informers/externalversions/user/v1 github.com/openshift/client-go/user/listers/user/v1 -# github.com/openshift/cluster-policy-controller v0.0.0-20260902120314-c9e9a3482609 +# github.com/openshift/cluster-policy-controller v0.0.0-20261019223900-81e222007c2c ## explicit; go 1.26.0 github.com/openshift/cluster-policy-controller/pkg/client/genericinformers github.com/openshift/cluster-policy-controller/pkg/cmd/cluster-policy-controller @@ -728,7 +730,7 @@ github.com/openshift/cluster-policy-controller/pkg/security/controller github.com/openshift/cluster-policy-controller/pkg/security/mcs github.com/openshift/cluster-policy-controller/pkg/security/uidallocator github.com/openshift/cluster-policy-controller/pkg/version -# github.com/openshift/library-go v0.0.0-20261001144932-192662696fc7 +# github.com/openshift/library-go v0.0.0-20261012084302-f23ec502bed4 ## explicit; go 1.26.0 github.com/openshift/library-go/pkg/apiserver/admission/admissionrestconfig github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout