Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

remove opencensus extension packages from whitelists (prepare for 0.1.9) #336

Merged
ylil93 merged 3 commits into from
Jun 13, 2019
Merged

remove opencensus extension packages from whitelists (prepare for 0.1.9) #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f82711
remove opencensus extension packages from whitelists
ylil93 Jun 13, 2019
52e3468
update deploy file
ylil93 Jun 13, 2019
404cdca
prepare for 0.1.9
ylil93 Jun 13, 2019
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
75 changes: 0 additions & 75 deletions compatibility_lib/compatibility_lib/configs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,29 +104,6 @@ def _format_url(repo_name, setuppy_path=''):
'grpc-google-iam-v1',
'grpcio',
'opencensus',
'opencensus-correlation',
'opencensus-ext-azure',
'opencensus-ext-dbapi',
'opencensus-ext-django',
'opencensus-ext-flask',
'opencensus-ext-gevent',
'opencensus-ext-google-cloud-clientlibs',
'opencensus-ext-grpc',
'opencensus-ext-httplib',
'opencensus-ext-jaeger',
'opencensus-ext-logging',
'opencensus-ext-mysql',
'opencensus-ext-ocagent',
'opencensus-ext-postgresql',
'opencensus-ext-prometheus',
'opencensus-ext-pymongo',
'opencensus-ext-pymysql',
'opencensus-ext-pyramid',
'opencensus-ext-requests',
'opencensus-ext-sqlalchemy',
'opencensus-ext-stackdriver',
'opencensus-ext-threading',
'opencensus-ext-zipkin',
'protobuf',
'protorpc',
'tensorboard',
Expand Down Expand Up @@ -242,58 +219,6 @@ def _format_url(repo_name, setuppy_path=''):
_format_url('apache/beam', 'sdks/python'): 'apache-beam[gcp]',
_format_url('google/apitools'): 'google-apitools',
_format_url('census-instrumentation/opencensus-python'): 'opencensus',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-correlation'): 'opencensus-correlation',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-azure'): 'opencensus-ext-azure',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-dbapi'): 'opencensus-ext-dbapi',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-django'): 'opencensus-ext-django',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-flask'): 'opencensus-ext-flask',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-gevent'): 'opencensus-ext-gevent',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-google-cloud-clientlibs'):
'opencensus-ext-google-cloud-clientlibs',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-grpc'): 'opencensus-ext-grpc',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-httplib'): 'opencensus-ext-httplib',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-jaeger'): 'opencensus-ext-jaeger',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-logging'): 'opencensus-ext-logging',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-mysql'): 'opencensus-ext-mysql',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-ocagent'): 'opencensus-ext-ocagent',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-postgresql'):
'opencensus-ext-postgresql',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-prometheus'):
'opencensus-ext-prometheus',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-pymongo'): 'opencensus-ext-pymongo',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-pymysql'): 'opencensus-ext-pymysql',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-pyramid'): 'opencensus-ext-pyramid',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-requests'): 'opencensus-ext-requests',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-sqlalchemy'):
'opencensus-ext-sqlalchemy',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-stackdriver'):
'opencensus-ext-stackdriver',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-threading'):
'opencensus-ext-threading',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-zipkin'): 'opencensus-ext-zipkin',
_format_url('google/protorpc'): 'protorpc',
_format_url('tensorflow/tensorflow', 'tensorflow/tools/pip_package'):
'tensorflow',
Expand Down
2 changes: 1 addition & 1 deletion compatibility_lib/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setuptools.setup(
name="compatibility_lib",
version="0.1.8",
version="0.1.9",
author="Cloud Python",
description="A library to get and store the dependency compatibility "
"status data to BigQuery.",
Expand Down
75 changes: 0 additions & 75 deletions compatibility_server/configs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,29 +104,6 @@ def _format_url(repo_name, setuppy_path=''):
'grpc-google-iam-v1',
'grpcio',
'opencensus',
'opencensus-correlation',
'opencensus-ext-azure',
'opencensus-ext-dbapi',
'opencensus-ext-django',
'opencensus-ext-flask',
'opencensus-ext-gevent',
'opencensus-ext-google-cloud-clientlibs',
'opencensus-ext-grpc',
'opencensus-ext-httplib',
'opencensus-ext-jaeger',
'opencensus-ext-logging',
'opencensus-ext-mysql',
'opencensus-ext-ocagent',
'opencensus-ext-postgresql',
'opencensus-ext-prometheus',
'opencensus-ext-pymongo',
'opencensus-ext-pymysql',
'opencensus-ext-pyramid',
'opencensus-ext-requests',
'opencensus-ext-sqlalchemy',
'opencensus-ext-stackdriver',
'opencensus-ext-threading',
'opencensus-ext-zipkin',
'protobuf',
'protorpc',
'tensorboard',
Expand Down Expand Up @@ -242,58 +219,6 @@ def _format_url(repo_name, setuppy_path=''):
_format_url('apache/beam', 'sdks/python'): 'apache-beam[gcp]',
_format_url('google/apitools'): 'google-apitools',
_format_url('census-instrumentation/opencensus-python'): 'opencensus',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-correlation'): 'opencensus-correlation',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-azure'): 'opencensus-ext-azure',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-dbapi'): 'opencensus-ext-dbapi',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-django'): 'opencensus-ext-django',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-flask'): 'opencensus-ext-flask',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-gevent'): 'opencensus-ext-gevent',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-google-cloud-clientlibs'):
'opencensus-ext-google-cloud-clientlibs',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-grpc'): 'opencensus-ext-grpc',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-httplib'): 'opencensus-ext-httplib',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-jaeger'): 'opencensus-ext-jaeger',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-logging'): 'opencensus-ext-logging',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-mysql'): 'opencensus-ext-mysql',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-ocagent'): 'opencensus-ext-ocagent',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-postgresql'):
'opencensus-ext-postgresql',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-prometheus'):
'opencensus-ext-prometheus',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-pymongo'): 'opencensus-ext-pymongo',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-pymysql'): 'opencensus-ext-pymysql',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-pyramid'): 'opencensus-ext-pyramid',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-requests'): 'opencensus-ext-requests',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-sqlalchemy'):
'opencensus-ext-sqlalchemy',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-stackdriver'):
'opencensus-ext-stackdriver',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-threading'):
'opencensus-ext-threading',
_format_url('census-instrumentation/opencensus-python',
'contrib/opencensus-ext-zipkin'): 'opencensus-ext-zipkin',
_format_url('google/protorpc'): 'protorpc',
_format_url('tensorflow/tensorflow', 'tensorflow/tools/pip_package'):
'tensorflow',
Expand Down
32 changes: 16 additions & 16 deletions compatibility_server/deployment/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
annotations:
creationTimestamp: "2018-06-15T20:08:48Z"
deployment.kubernetes.io/revision: "36"
creationTimestamp: 2018-06-15T20:08:48Z
deployment.kubernetes.io/revision: "44"
kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"extensions/v1beta1","kind":"Deployment","metadata":{"annotations":{"creationTimestamp":"2018-06-15T20:08:48Z","deployment.kubernetes.io/revision":"33"},"creationTimestamp":"2018-06-15T20:08:48Z","generation":98,"labels":{"run":"compatibility-server"},"name":"compatibility-server","namespace":"default","resourceVersion":"59364428","selfLink":"/apis/extensions/v1beta1/namespaces/default/deployments/compatibility-server","uid":"ea4ab52b-70d7-11e8-8f57-42010a800003"},"spec":{"progressDeadlineSeconds":600,"replicas":10,"revisionHistoryLimit":10,"selector":{"matchLabels":{"run":"compatibility-server"}},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":1},"type":"RollingUpdate"},"template":{"metadata":{"creationTimestamp":null,"labels":{"run":"compatibility-server"}},"spec":{"containers":[{"image":"gcr.io/python-compatibility-tools/compatibility-server:v28","imagePullPolicy":"IfNotPresent","name":"compatibility-server","ports":[{"containerPort":8888,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","volumeMounts":[{"mountPath":"/var/run/docker.sock","name":"docker-sock"}]}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","schedulerName":"default-scheduler","securityContext":{},"terminationGracePeriodSeconds":310,"volumes":[{"hostPath":{"path":"/var/run/docker.sock","type":"File"},"name":"docker-sock"}]}}},"status":{"availableReplicas":10,"conditions":[{"lastTransitionTime":"2019-03-01T17:42:26Z","lastUpdateTime":"2019-03-09T17:38:22Z","message":"ReplicaSet \"compatibility-server-7bb97bfdc4\" has successfully progressed.","reason":"NewReplicaSetAvailable","status":"True","type":"Progressing"},{"lastTransitionTime":"2019-03-10T02:36:44Z","lastUpdateTime":"2019-03-10T02:36:44Z","message":"Deployment has minimum availability.","reason":"MinimumReplicasAvailable","status":"True","type":"Available"}],"observedGeneration":98,"readyReplicas":10,"replicas":10,"updatedReplicas":10}}
creationTimestamp: "2018-06-15T20:08:48Z"
generation: 102
{"apiVersion":"extensions/v1beta1","kind":"Deployment","metadata":{"annotations":{"creationTimestamp":"2018-06-15T20:08:48Z","deployment.kubernetes.io/revision":"41"},"creationTimestamp":"2018-06-15T20:08:48Z","generation":108,"labels":{"run":"compatibility-server"},"name":"compatibility-server","namespace":"default","resourceVersion":"128704700","selfLink":"/apis/extensions/v1beta1/namespaces/default/deployments/compatibility-server","uid":"ea4ab52b-70d7-11e8-8f57-42010a800003"},"spec":{"progressDeadlineSeconds":600,"replicas":200,"revisionHistoryLimit":10,"selector":{"matchLabels":{"run":"compatibility-server"}},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":1},"type":"RollingUpdate"},"template":{"metadata":{"creationTimestamp":null,"labels":{"run":"compatibility-server"}},"spec":{"containers":[{"image":"gcr.io/python-compatibility-tools/compatibility-image:v31","imagePullPolicy":"IfNotPresent","name":"compatibility-server","ports":[{"containerPort":8888,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","volumeMounts":[{"mountPath":"/var/run/docker.sock","name":"docker-sock"}]}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","schedulerName":"default-scheduler","securityContext":{},"terminationGracePeriodSeconds":310,"volumes":[{"hostPath":{"path":"/var/run/docker.sock","type":"File"},"name":"docker-sock"}]}}},"status":{"availableReplicas":200,"conditions":[{"lastTransitionTime":"2019-06-13T15:32:29Z","lastUpdateTime":"2019-06-13T15:32:29Z","message":"Deployment has minimum availability.","reason":"MinimumReplicasAvailable","status":"True","type":"Available"},{"lastTransitionTime":"2019-06-12T00:53:51Z","lastUpdateTime":"2019-06-13T17:01:09Z","message":"ReplicaSet \"compatibility-server-6484ffd4f6\" has successfully progressed.","reason":"NewReplicaSetAvailable","status":"True","type":"Progressing"}],"observedGeneration":108,"readyReplicas":200,"replicas":200,"updatedReplicas":200}}
creationTimestamp: 2018-06-15T20:08:48Z
generation: 111
labels:
run: compatibility-server
name: compatibility-server
namespace: default
resourceVersion: "127286413"
resourceVersion: "128786447"
selfLink: /apis/extensions/v1beta1/namespaces/default/deployments/compatibility-server
uid: ea4ab52b-70d7-11e8-8f57-42010a800003
spec:
Expand All @@ -34,7 +34,7 @@ spec:
run: compatibility-server
spec:
containers:
- image: gcr.io/python-compatibility-tools/compatibility-image:v30
- image: gcr.io/python-compatibility-tools/compatibility-image:v33
imagePullPolicy: IfNotPresent
name: compatibility-server
ports:
Expand All @@ -59,19 +59,19 @@ spec:
status:
availableReplicas: 200
conditions:
- lastTransitionTime: "2019-03-01T17:42:26Z"
lastUpdateTime: "2019-06-10T21:44:33Z"
message: ReplicaSet "compatibility-server-84769766f4" has successfully progressed.
reason: NewReplicaSetAvailable
status: "True"
type: Progressing
- lastTransitionTime: "2019-06-11T20:55:19Z"
lastUpdateTime: "2019-06-11T20:55:19Z"
- lastTransitionTime: 2019-06-13T19:21:20Z
lastUpdateTime: 2019-06-13T19:21:20Z
message: Deployment has minimum availability.
reason: MinimumReplicasAvailable
status: "True"
type: Available
observedGeneration: 102
- lastTransitionTime: 2019-06-12T00:53:51Z
lastUpdateTime: 2019-06-13T19:21:30Z
message: ReplicaSet "compatibility-server-589994f6bc" has successfully progressed.
reason: NewReplicaSetAvailable
status: "True"
type: Progressing
observedGeneration: 111
readyReplicas: 200
replicas: 200
updatedReplicas: 200
14 changes: 0 additions & 14 deletions compatibility_server/pip_checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
'google-cloud-python.git#subdirectory=')
CLIENTLIBS_GITHUB_URL = 'https://github.com/googleapis/google-cloud-python.git'

GITHUB_OPENCENSUS_PREFIX = ('git+git://github.com/census-instrumentation/'
'opencensus-python.git#subdirectory=')
OPENCENSUS_GITHUB_URL = ('https://github.com/census-instrumentation/'
'opencensus-python.git')

# Pattern for pip installation errors not related to the package being
# installed. See:
# https://github.com/pypa/pip/blob/3a77bd667cc68935040563e1351604c461ce5333/src/pip/_internal/commands/install.py#L533
Expand Down Expand Up @@ -437,21 +432,12 @@ def _install(self, container: docker.models.containers.Container):
client_repo_directory = self._clone_repo(
container, CLIENTLIBS_GITHUB_URL)

opencensus_repo_directory = ''
if any(GITHUB_OPENCENSUS_PREFIX in pkg for pkg in self._packages):
opencensus_repo_directory = self._clone_repo(
container, OPENCENSUS_GITHUB_URL)

install_names = []
for pkg in self._packages:
if GITHUB_CLIENTLIBS_PREFIX in pkg:
install_subdirectory = pkg.split(GITHUB_CLIENTLIBS_PREFIX)[1]
install_names.append(
os.path.join(client_repo_directory, install_subdirectory))
elif GITHUB_OPENCENSUS_PREFIX in pkg:
install_subdirectory = pkg.split(GITHUB_OPENCENSUS_PREFIX)[1]
install_names.append(os.path.join(
opencensus_repo_directory, install_subdirectory))
else:
install_names.append(pkg)

Expand Down