Skip to content

Commit feb9304

Browse files
DeanDoyle1502DeanDoyle1502
authored
OSSM-5849 - add infrastructure feature related annotations (#1617)
* OSSM-5849 - add infrastructure feature related annotations * OSSM-5894 Fixed incosistent quotation marks
1 parent c7e5317 commit feb9304

File tree

4 files changed

+64
-2
lines changed

4 files changed

+64
-2
lines changed

‎build/generate-manifests.sh‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ if [[ ${COMMUNITY} == "true" ]]; then
2626
OLM_FEATURES="[]"
2727
ARCHITECTURE_LABELS=$(generateArchitectureLabels amd64)
2828
OLM_SUBSCRIPTION_ANNOTATION=""
29+
OLM_FEATURE_DISCONNECTED="false"
30+
OLM_FEATURE_FIPS_COMPLIANT="false"
31+
OLM_FEATURE_PROXY_AWARE="true"
32+
OLM_FEATURE_TLS_PROFILES="false"
33+
OLM_FEATURE_TOKEN_AUTH_AWS="false"
34+
OLM_FEATURE_TOKEN_AUTH_AZURE="false"
35+
OLM_FEATURE_TOKEN_AUTH_GCP="false"
36+
OLM_FEATURE_CNF="false"
37+
OLM_FEATURE_CNI="true"
38+
OLM_FEATURE_CSI="false"
2939
else
3040
BUILD_TYPE="servicemesh"
3141
JAEGER_STORAGE="Memory"
@@ -37,6 +47,17 @@ else
3747
OLM_FEATURES="[\"Disconnected\",\"fips\"]"
3848
ARCHITECTURE_LABELS=$(generateArchitectureLabels amd64 s390x ppc64le arm64)
3949
OLM_SUBSCRIPTION_ANNOTATION="operators.openshift.io/valid-subscription: '[\"OpenShift Container Platform\", \"OpenShift Platform Plus\"]'"
50+
OLM_FEATURE_DISCONNECTED="true"
51+
OLM_FEATURE_FIPS_COMPLIANT="true"
52+
OLM_FEATURE_PROXY_AWARE="true"
53+
OLM_FEATURE_TLS_PROFILES="false"
54+
OLM_FEATURE_TOKEN_AUTH_AWS="false"
55+
OLM_FEATURE_TOKEN_AUTH_AZURE="false"
56+
OLM_FEATURE_TOKEN_AUTH_GCP="false"
57+
OLM_FEATURE_CNF="false"
58+
OLM_FEATURE_CNI="true"
59+
OLM_FEATURE_CSI="false"
60+
4061
fi
4162
: "${DEPLOYMENT_FILE:=deploy/${BUILD_TYPE}-operator.yaml}"
4263
: "${MANIFESTS_DIR:=manifests-${BUILD_TYPE}}"
@@ -115,6 +136,17 @@ $RELATED_IMAGES"
115136
sed -i -e 's+__BUG_URL__+'"$BUG_URL"'+' "${csv_path}"
116137
sed -i -e 's+__OLM_FEATURES__+'"$OLM_FEATURES"'+' "${csv_path}"
117138
sed -i -e 's+__OLM_SUBSCRIPTION_ANNOTATION__+'"$OLM_SUBSCRIPTION_ANNOTATION"'+' "${csv_path}"
139+
sed -i -e 's+__OLM_FEATURE_DISCONNECTED__+'"$OLM_FEATURE_DISCONNECTED"'+' "${csv_path}"
140+
sed -i -e 's+__OLM_FEATURE_FIPS_COMPLIANT__+'"$OLM_FEATURE_FIPS_COMPLIANT"'+' "${csv_path}"
141+
sed -i -e 's+__OLM_FEATURE_PROXY_AWARE__+'"$OLM_FEATURE_PROXY_AWARE"'+' "${csv_path}"
142+
sed -i -e 's+__OLM_FEATURE_TLS_PROFILES__+'"$OLM_FEATURE_TLS_PROFILES"'+' "${csv_path}"
143+
sed -i -e 's+__OLM_FEATURE_TOKEN_AUTH_AWS__+'"$OLM_FEATURE_TOKEN_AUTH_AWS"'+' "${csv_path}"
144+
sed -i -e 's+__OLM_FEATURE_TOKEN_AUTH_AZURE__+'"$OLM_FEATURE_TOKEN_AUTH_AZURE"'+' "${csv_path}"
145+
sed -i -e 's+__OLM_FEATURE_TOKEN_AUTH_GCP__+'"$OLM_FEATURE_TOKEN_AUTH_GCP"'+' "${csv_path}"
146+
sed -i -e 's+__OLM_FEATURE_TOKEN_AUTH_AWS__+'"$OLM_FEATURE_TOKEN_AUTH_AWS"'+' "${csv_path}"
147+
sed -i -e 's+__OLM_FEATURE_CNF__+'"$OLM_FEATURE_CNF"'+' "${csv_path}"
148+
sed -i -e 's+__OLM_FEATURE_CNI__+'"$OLM_FEATURE_CNI"'+' "${csv_path}"
149+
sed -i -e 's+__OLM_FEATURE_CSI__+'"$OLM_FEATURE_CSI"'+' "${csv_path}"
118150
sed -i -e 's/__JAEGER_STORAGE__/'${JAEGER_STORAGE}'/' "${csv_path}"
119151
sed -i -e 's/__DATE__/'"$(date +%Y-%m-%dT%H:%M:%S%Z)"'/g' "${csv_path}"
120152
sed -i -e 's+__IMAGE_SRC__+'"${IMAGE_SRC}"'+g' "${csv_path}"

‎build/manifest-templates/clusterserviceversion.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ metadata:
1919
olm.skipRange: ">=1.0.2 <__SEMANTIC_VERSION__"
2020
operators.openshift.io/infrastructure-features: '__OLM_FEATURES__'
2121
__OLM_SUBSCRIPTION_ANNOTATION__
22+
features.operators.openshift.io/disconnected: '__OLM_FEATURE_DISCONNECTED__'
23+
features.operators.openshift.io/fips-compliant: '__OLM_FEATURE_FIPS_COMPLIANT__'
24+
features.operators.openshift.io/proxy-aware: '__OLM_FEATURE_PROXY_AWARE__'
25+
features.operators.openshift.io/tls-profiles: '__OLM_FEATURE_TLS_PROFILES__'
26+
features.operators.openshift.io/token-auth-aws: '__OLM_FEATURE_TOKEN_AUTH_AWS__'
27+
features.operators.openshift.io/token-auth-azure: '__OLM_FEATURE_TOKEN_AUTH_AZURE__'
28+
features.operators.openshift.io/token-auth-gcp: '__OLM_FEATURE_TOKEN_AUTH_GCP__'
29+
features.operators.openshift.io/cnf: '__OLM_FEATURE_CNF__'
30+
features.operators.openshift.io/cni: '__OLM_FEATURE_CNI__'
31+
features.operators.openshift.io/csi: '__OLM_FEATURE_CSI__'
2232
alm-examples: |-
2333
[
2434
{

‎manifests-maistra/2.5.0/maistraoperator.v2.5.0.clusterserviceversion.yaml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,21 @@ metadata:
1515
The Maistra Operator enables you to install, configure, and manage an instance of Maistra service mesh. Maistra is based on the open source Istio project.
1616
1717
containerImage: quay.io/maistra/istio-ubi8-operator:2.5.0
18-
createdAt: 2023-10-05T22:49:57CEST
18+
createdAt: 2024-02-09T14:17:19GMT
1919
support: Red Hat, Inc.
2020
olm.skipRange: ">=1.0.2 <2.5.0-0"
2121
operators.openshift.io/infrastructure-features: '[]'
2222

23+
features.operators.openshift.io/disconnected: 'false'
24+
features.operators.openshift.io/fips-compliant: 'false'
25+
features.operators.openshift.io/proxy-aware: 'true'
26+
features.operators.openshift.io/tls-profiles: 'false'
27+
features.operators.openshift.io/token-auth-aws: 'false'
28+
features.operators.openshift.io/token-auth-azure: 'false'
29+
features.operators.openshift.io/token-auth-gcp: 'false'
30+
features.operators.openshift.io/cnf: 'false'
31+
features.operators.openshift.io/cni: 'true'
32+
features.operators.openshift.io/csi: 'false'
2333
alm-examples: |-
2434
[
2535
{

‎manifests-servicemesh/2.5.0/servicemeshoperator.v2.5.0.clusterserviceversion.yaml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,21 @@ metadata:
1818
The OpenShift Service Mesh Operator enables you to install, configure, and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service Mesh is based on the open source Istio project.
1919
2020
containerImage: ${OSSM_OPERATOR_IMAGE}
21-
createdAt: 2023-10-05T22:49:58CEST
21+
createdAt: 2024-02-09T14:17:20GMT
2222
support: Red Hat, Inc.
2323
olm.skipRange: ">=1.0.2 <2.5.0-0"
2424
operators.openshift.io/infrastructure-features: '["Disconnected","fips"]'
2525
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]'
26+
features.operators.openshift.io/disconnected: 'true'
27+
features.operators.openshift.io/fips-compliant: 'true'
28+
features.operators.openshift.io/proxy-aware: 'true'
29+
features.operators.openshift.io/tls-profiles: 'false'
30+
features.operators.openshift.io/token-auth-aws: 'false'
31+
features.operators.openshift.io/token-auth-azure: 'false'
32+
features.operators.openshift.io/token-auth-gcp: 'false'
33+
features.operators.openshift.io/cnf: 'false'
34+
features.operators.openshift.io/cni: 'true'
35+
features.operators.openshift.io/csi: 'false'
2636
alm-examples: |-
2737
[
2838
{

0 commit comments

Comments
 (0)