Skip to content

Use pinned operand image versions from quay.io #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2021
Merged

Use pinned operand image versions from quay.io #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bundle/manifests/elasticsearch-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,13 +488,13 @@ spec:
- name: PROXY_IMAGE
value: quay.io/openshift/origin-oauth-proxy:latest
- name: ELASTICSEARCH_PROXY
value: quay.io/openshift-logging/elasticsearch-proxy:latest
value: quay.io/openshift-logging/elasticsearch-proxy:1.0
- name: ELASTICSEARCH_IMAGE
value: quay.io/openshift-logging/elasticsearch6:latest
value: quay.io/openshift-logging/elasticsearch6:6.8.1
- name: KIBANA_IMAGE
value: quay.io/openshift-logging/kibana6:latest
value: quay.io/openshift-logging/kibana6:6.8.1
- name: CURATOR_IMAGE
value: quay.io/openshift-logging/curator5:latest
value: quay.io/openshift-logging/curator5:5.8.1
image: quay.io/openshift-logging/elasticsearch-operator:latest
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down
12 changes: 12 additions & 0 deletions bundle/manifests/metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
labels:
name: elasticsearch-operator
name: metrics-reader
rules:
- nonResourceURLs:
- /metrics
verbs:
- get
8 changes: 4 additions & 4 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ spec:
- name: PROXY_IMAGE
value: "quay.io/openshift/origin-oauth-proxy:latest"
- name: ELASTICSEARCH_PROXY
value: "quay.io/openshift-logging/elasticsearch-proxy:latest"
value: "quay.io/openshift-logging/elasticsearch-proxy:1.0"
- name: ELASTICSEARCH_IMAGE
value: "quay.io/openshift-logging/elasticsearch6:latest"
value: "quay.io/openshift-logging/elasticsearch6:6.8.1"
- name: KIBANA_IMAGE
value: "quay.io/openshift-logging/kibana6:latest"
value: "quay.io/openshift-logging/kibana6:6.8.1"
- name: CURATOR_IMAGE
value: "quay.io/openshift-logging/curator5:latest"
value: "quay.io/openshift-logging/curator5:5.8.1"
6 changes: 3 additions & 3 deletions internal/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const (
TrustedCABundleHashName = "logging.openshift.io/hash"
KibanaTrustedCAName = "kibana-trusted-ca-bundle"
SecretHashPrefix = "logging.openshift.io/"
ElasticsearchDefaultImage = "quay.io/openshift-logging/elasticsearch6"
ProxyDefaultImage = "quay.io/openshift-logging/elasticsearch-proxy:latest"
CuratorDefaultImage = "quay.io/openshift-logging/curator5"
ElasticsearchDefaultImage = "quay.io/openshift-logging/elasticsearch6:6.8.1"
ProxyDefaultImage = "quay.io/openshift-logging/elasticsearch-proxy:1.0"
CuratorDefaultImage = "quay.io/openshift-logging/curator5:5.8.1"
TheoreticalShardMaxSizeInMB = 40960

// OcpTemplatePrefix is the prefix all operator generated templates
Expand Down
2 changes: 1 addition & 1 deletion internal/kibana/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ var (

defaultKibanaProxyMemory = resource.MustParse("256Mi")
defaultKibanaProxyCPURequest = resource.MustParse("100m")
kibanaDefaultImage = "quay.io/openshift-logging/kibana6:latest"
kibanaDefaultImage = "quay.io/openshift-logging/kibana6:6.8.1"
kibanaProxyDefaultImage = "quay.io/openshift/origin-oauth-proxy:latest"
)
2 changes: 2 additions & 0 deletions olm_deploy/operatorregistry/registry-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ spec:
value: ${IMAGE_OAUTH_PROXY}
- name: IMAGE_LOGGING_KIBANA6
value: ${IMAGE_LOGGING_KIBANA6}
- name: IMAGE_CURATOR5
value: ${IMAGE_CURATOR5}

containers:
- name: elasticsearch-operator-registry
Expand Down
1 change: 1 addition & 0 deletions olm_deploy/scripts/catalog-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ echo "kube rbac proxy: ${IMAGE_KUBE_RBAC_PROXY}"
echo "elastic6: ${IMAGE_ELASTICSEARCH6}"
echo "elasticsearch proxy: ${IMAGE_ELASTICSEARCH_PROXY}"
echo "kibana: ${IMAGE_LOGGING_KIBANA6}"
echo "curator5: ${IMAGE_CURATOR5}"
echo "oauth proxy: ${IMAGE_OAUTH_PROXY}"

echo "In namespace: ${ELASTICSEARCH_OPERATOR_NAMESPACE}"
Expand Down
11 changes: 8 additions & 3 deletions olm_deploy/scripts/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ set -eou pipefail

export OCP_VERSION=${OCP_VERSION:-4.7}
export LOGGING_VERSION=${LOGGING_VERSION:-5.2}
export LOGGING_ES_VERSION=${LOGGING_ES_VERSION:-6.8.1}
export LOGGING_KIBANA_VERSION=${LOGGING_KIBANA_VERSION:-6.8.1}
export LOGGING_ES_PROXY_VERSION=${LOGGING_ES_PROXY_VERSION:-1.0}
export LOGGING_CURATOR_VERSION=${LOGGING_CURATOR_VERSION:-5.8.1}
export LOGGING_IS=${LOGGING_IS:-openshift-logging}

#openshift images
Expand All @@ -14,8 +18,9 @@ IMAGE_ELASTICSEARCH_OPERATOR_REGISTRY=${IMAGE_ELASTICSEARCH_OPERATOR_REGISTRY:-q
export IMAGE_ELASTICSEARCH_OPERATOR_REGISTRY=${IMAGE_ELASTICSEARCH_OPERATOR_REGISTRY:-$LOCAL_IMAGE_ELASTICSEARCH_OPERATOR_REGISTRY}

export IMAGE_ELASTICSEARCH_OPERATOR=${IMAGE_ELASTICSEARCH_OPERATOR:-quay.io/${LOGGING_IS}/elasticsearch-operator:${LOGGING_VERSION}}
export IMAGE_ELASTICSEARCH6=${IMAGE_ELASTICSEARCH6:-quay.io/${LOGGING_IS}/elasticsearch6:${LOGGING_VERSION}}
export IMAGE_ELASTICSEARCH_PROXY=${IMAGE_ELASTICSEARCH_PROXY:-quay.io/${LOGGING_IS}/elasticsearch-proxy:${LOGGING_VERSION}}
export IMAGE_LOGGING_KIBANA6=${IMAGE_LOGGING_KIBANA6:-quay.io/${LOGGING_IS}/kibana6:${LOGGING_VERSION}}
export IMAGE_ELASTICSEARCH6=${IMAGE_ELASTICSEARCH6:-quay.io/${LOGGING_IS}/elasticsearch6:${LOGGING_ES_VERSION}}
export IMAGE_ELASTICSEARCH_PROXY=${IMAGE_ELASTICSEARCH_PROXY:-quay.io/${LOGGING_IS}/elasticsearch-proxy:${LOGGING_ES_PROXY_VERSION}}
export IMAGE_LOGGING_KIBANA6=${IMAGE_LOGGING_KIBANA6:-quay.io/${LOGGING_IS}/kibana6:${LOGGING_KIBANA_VERSION}}
export IMAGE_CURATOR5=${IMAGE_CURATOR5:-quay.io/${LOGGING_IS}/curator5:${LOGGING_CURATOR_VERSION}}

export ELASTICSEARCH_OPERATOR_NAMESPACE=${ELASTICSEARCH_OPERATOR_NAMESPACE:-openshift-operators-redhat}
7 changes: 4 additions & 3 deletions olm_deploy/scripts/registry-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ echo -e "\n\n"
# update the manifest with the image built by ci
sed -i "s,quay.io/openshift-logging/elasticsearch-operator:latest,${IMAGE_ELASTICSEARCH_OPERATOR}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift/origin-kube-rbac-proxy:latest,${IMAGE_KUBE_RBAC_PROXY}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift-logging/elasticsearch6:latest,${IMAGE_ELASTICSEARCH6}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift-logging/elasticsearch-proxy:latest,${IMAGE_ELASTICSEARCH_PROXY}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift-logging/elasticsearch6:6.8.1,${IMAGE_ELASTICSEARCH6}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift-logging/elasticsearch-proxy:1.0,${IMAGE_ELASTICSEARCH_PROXY}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift/origin-oauth-proxy:latest,${IMAGE_OAUTH_PROXY}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift-logging/kibana6:latest,${IMAGE_LOGGING_KIBANA6}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift-logging/kibana6:6.8.1,${IMAGE_LOGGING_KIBANA6}," /manifests/*clusterserviceversion.yaml
sed -i "s,quay.io/openshift-logging/curator5:5.8.1,${IMAGE_CURATOR5}," /manifests/*clusterserviceversion.yaml

# update the manifest to pull always the operator image for non-CI environments
if [ "${OPENSHIFT_CI:-false}" == "false" ] ; then
Expand Down