Skip to content
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.

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

fix: Upgrade oc to 4.4 and use UBI8 base image #71

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM registry.centos.org/centos/centos:7
MAINTAINER Tomas Hrcka <thrcka@redhat.com>
FROM registry.access.redhat.com/ubi8/ubi-minimal

ENV LANG=en_US.UTF-8

RUN yum --setopt=tsflags=nodocs install -y epel-release centos-release-openshift-origin36 && \
yum --setopt=tsflags=nodocs install -y python36-pip wget python36-devel libxml2-devel libxslt-devel python36-requests python36-pycurl origin-clients && \
yum clean all
RUN microdnf install python3 tar gzip &&\
microdnf clean all &&\
rm -fr /var/cache/lib/{dnf,rpm}

COPY requirements.txt /tmp/
RUN pip3 install --upgrade pip && pip install --upgrade wheel
RUN pip3 install -r /tmp/requirements.txt
RUN pip3 install --no-cache-dir --no-cache --upgrade pip && pip install --no-cache-dir --no-cache --upgrade wheel
RUN pip3 install --no-cache-dir --no-cache -r /tmp/requirements.txt
RUN curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz -o - | tar -zx -C /usr/bin
Copy link
Member

Choose a reason for hiding this comment

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

why is this required?

Copy link
Member Author

Choose a reason for hiding this comment

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

OSD4 needs oc >= 4.x to interact with.


RUN mkdir -p /home/scaler/ /var/lib/f8a-scaler/

Expand Down
21 changes: 0 additions & 21 deletions Dockerfile.rhel

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ REGISTRY := quay.io
DEFAULT_TAG=latest

ifeq ($(TARGET),rhel)
DOCKERFILE := Dockerfile.rhel
DOCKERFILE := Dockerfile
REPOSITORY ?= openshiftio/rhel-fabric8-analytics-worker-scaler
else
DOCKERFILE := Dockerfile
Expand Down
2 changes: 2 additions & 0 deletions cico_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ load_jenkins_vars() {
prep() {
yum -y install epel-release
yum -y install docker git python36-pip
# This we should remove once the package subscription-manager-rhsm-certificates fixed
touch /etc/rhsm/ca/redhat-uep.pem
systemctl start docker
pip3 install -r requirements.txt
}
Expand Down
21 changes: 13 additions & 8 deletions openshift/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ metadata:
annotations:
description: f8a-worker-scaler
objects:
- apiVersion: v1
kind: ServiceAccount
metadata:
name: workerscaler
- apiVersion: v1
kind: RoleBinding
metadata:
name: workerscaler-edit
roleRef:
name: edit
subjects:
- kind: ServiceAccount
name: workerscaler
- apiVersion: v1
kind: DeploymentConfig
metadata:
Expand Down Expand Up @@ -55,8 +68,6 @@ objects:
value: "${SLEEP_INTERVAL}"
- name: DRY_RUN
value: "${DRY_RUN}"
- name: OC_PROJECT
value: "${OC_PROJECT}"
image: "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${IMAGE_TAG}"
name: f8a-worker-scaler
resources:
Expand Down Expand Up @@ -125,12 +136,6 @@ parameters:
name: SQS_QUEUE_NAME
value: "ingestion_bayesianFlow_v0,ingestion_bayesianPackageFlow_v0"

- description: Name of the openshift project used for oc command
displayName: Openshift Project Name
required: true
name: OC_PROJECT
value: "bayesian-preview"

- description: Docker registry where the image is
displayName: Docker registry
required: true
Expand Down
9 changes: 0 additions & 9 deletions openshift/workerscaler.rolebinding.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions openshift/workerscaler.serviceaccount.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions scale.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ while true; do
echo "[$(date -u)] Number of messages in ${DEPLOYMENT_PREFIX}_{${SQS_QUEUE_NAME}} is ${msg_count}. Replicas needed: ${replicas}."

if [ "$dry_run" == "True" ]; then
echo "[DRY-RUN] oc -n ${OC_PROJECT} scale --replicas=${replicas} dc ${DC_NAME}"
echo "[DRY-RUN] oc scale --replicas=${replicas} dc ${DC_NAME}"
else
set -x
oc -n ${OC_PROJECT} scale --replicas=${replicas} dc ${DC_NAME}
oc scale --replicas=${replicas} dc ${DC_NAME}
set +x
fi

Expand Down