Skip to content

Commit

Permalink
Fix kie-issues #1217 - Replace quay.io with docker.io (#3525)
Browse files Browse the repository at this point in the history
* Fix kie-issues #1217 - Replace quay.io with docker.io

Signed-off-by: Ricardo Zanini <[email protected]>

* Replace outdated image with bananas 🍌

Signed-off-by: Ricardo Zanini <[email protected]>

---------

Signed-off-by: Ricardo Zanini <[email protected]>
  • Loading branch information
ricardozanini authored May 22, 2024
1 parent fcd5d3a commit 030a82a
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.deploy
Original file line number Diff line number Diff line change
Expand Up @@ -305,5 +305,5 @@ String getWorkflowCommonDeploymentPath() {
}

String getDataIndexEphemeralReleaseImage() {
return "quay.io/kiegroup/kogito-data-index-ephemeral:${util.getMajorMinorVersion(getProjectVersion())}"
return "docker.io/apache/incubator-kie-kogito-data-index-ephemeral:${util.getMajorMinorVersion(getProjectVersion())}"
}
6 changes: 3 additions & 3 deletions .ci/jenkins/Jenkinsfile.setup-branch
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.jenkinsci.plugins.workflow.libs.Library
import org.kie.jenkins.MavenCommand

droolsRepo = 'incubator-kie-drools'
dataIndexEphemeralImageName = 'quay.io/kiegroup/kogito-data-index-ephemeral'
dataIndexEphemeralImageName = 'docker.io/apache/incubator-kie-kogito-data-index-ephemeral'

pipeline {
agent {
Expand Down Expand Up @@ -213,11 +213,11 @@ String getWorkflowCommonDeploymentRelativePath() {

String getDataIndexEphemeralImage() {
if (isMainBranch()) {
return "${dataIndexEphemeralImageName}-nightly:latest"
return "${dataIndexEphemeralImageName}:main"
}
String version = getKogitoVersion()
if (version.endsWith('-SNAPSHOT')) {
return "${dataIndexEphemeralImageName}-nightly:${util.getMajorMinorVersion(version)}"
return "${dataIndexEphemeralImageName}:${util.getMajorMinorVersion(version)}"
}
return "${dataIndexEphemeralImageName}:${util.getMajorMinorVersion(version)}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: example-deployment-no-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
spec:
containers:
- name: example-deployment-with-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
defaultMode: 420
containers:
- name: example-deployment-no-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
ports:
- containerPort: 8080
protocol: TCP
Expand Down Expand Up @@ -121,6 +121,6 @@ status:
lastState: {}
ready: true
restartCount: 0
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
started: true
qosClass: BestEffort
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
spec:
containers:
- name: example-deployment-no-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
ports:
- containerPort: 8080
protocol: TCP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: example-dc-no-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
ports:
- containerPort: 8080
name: web
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: example-dc-with-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
ports:
- containerPort: 8080
name: http
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ spec:
readOnly: true
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
terminationMessagePolicy: File
image: 'quay.io/kiegroup/process-quarkus-example:latest'
image: 'docker.io/namespace/bananas:latest'
serviceAccount: default
volumes:
- name: kube-api-access-mg9n9
Expand Down Expand Up @@ -149,5 +149,5 @@ status:
state:
running:
startedAt: '2022-08-22T17:30:29Z'
image: 'quay.io/kiegroup/process-quarkus-example:latest'
image: 'docker.io/namespace/bananas:latest'
qosClass: BestEffort
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ metadata:
openshift.io/deployment.status-reason: config change
openshift.io/deployment.replicas: '1'
openshift.io/encoded-deployment-config: >
{"kind":"DeploymentConfig","apiVersion":"apps.openshift.io/v1","metadata":{"name":"example-dc-no-service","namespace":"serverless-workflow-greeting-quarkus","uid":"a01d76e9-6b3a-48bf-8224-acb9de3c4ca0","resourceVersion":"1127454401","generation":1,"creationTimestamp":"2022-08-22T17:30:09Z","labels":{"app":"example-dc-no-service"},"managedFields":[{"manager":"Mozilla","operation":"Update","apiVersion":"apps.openshift.io/v1","time":"2022-08-22T17:30:09Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{".":{},"f:app":{}}},"f:spec":{"f:replicas":{},"f:selector":{".":{},"f:app":{}},"f:strategy":{"f:activeDeadlineSeconds":{},"f:rollingParams":{".":{},"f:intervalSeconds":{},"f:maxSurge":{},"f:maxUnavailable":{},"f:timeoutSeconds":{},"f:updatePeriodSeconds":{}},"f:type":{}},"f:template":{".":{},"f:metadata":{".":{},"f:creationTimestamp":{},"f:labels":{".":{},"f:app":{}}},"f:spec":{".":{},"f:containers":{".":{},"k:{\"name\":\"example-dc-no-service\"}":{".":{},"f:image":{},"f:imagePullPolicy":{},"f:name":{},"f:ports":{".":{},"k:{\"containerPort\":8009,\"protocol\":\"TCP\"}":{".":{},"f:containerPort":{},"f:name":{},"f:protocol":{}},"k:{\"containerPort\":8080,\"protocol\":\"TCP\"}":{".":{},"f:containerPort":{},"f:name":{},"f:protocol":{}}},"f:resources":{},"f:terminationMessagePath":{},"f:terminationMessagePolicy":{}}},"f:dnsPolicy":{},"f:restartPolicy":{},"f:schedulerName":{},"f:securityContext":{},"f:terminationGracePeriodSeconds":{}}},"f:triggers":{}}}},{"manager":"openshift-controller-manager","operation":"Update","apiVersion":"apps.openshift.io/v1","time":"2022-08-22T17:30:09Z","fieldsType":"FieldsV1","fieldsV1":{"f:status":{"f:details":{".":{},"f:causes":{},"f:message":{}},"f:latestVersion":{}}},"subresource":"status"}]},"spec":{"strategy":{"type":"Rolling","rollingParams":{"updatePeriodSeconds":1,"intervalSeconds":1,"timeoutSeconds":600,"maxUnavailable":"25%","maxSurge":"25%"},"resources":{},"activeDeadlineSeconds":21600},"triggers":[{"type":"ConfigChange"}],"replicas":1,"revisionHistoryLimit":10,"test":false,"selector":{"app":"example-dc-no-service"},"template":{"metadata":{"creationTimestamp":null,"labels":{"app":"example-dc-no-service"}},"spec":{"containers":[{"name":"example-dc-no-service","image":"quay.io/kiegroup/process-quarkus-example:latest","ports":[{"name":"http","containerPort":8080,"protocol":"TCP"},{"name":"another-http","containerPort":8009,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","imagePullPolicy":"Always"}],"restartPolicy":"Always","terminationGracePeriodSeconds":30,"dnsPolicy":"ClusterFirst","securityContext":{},"schedulerName":"default-scheduler"}}},"status":{"latestVersion":1,"observedGeneration":0,"replicas":0,"updatedReplicas":0,"availableReplicas":0,"unavailableReplicas":0,"details":{"message":"config
{"kind":"DeploymentConfig","apiVersion":"apps.openshift.io/v1","metadata":{"name":"example-dc-no-service","namespace":"serverless-workflow-greeting-quarkus","uid":"a01d76e9-6b3a-48bf-8224-acb9de3c4ca0","resourceVersion":"1127454401","generation":1,"creationTimestamp":"2022-08-22T17:30:09Z","labels":{"app":"example-dc-no-service"},"managedFields":[{"manager":"Mozilla","operation":"Update","apiVersion":"apps.openshift.io/v1","time":"2022-08-22T17:30:09Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{".":{},"f:app":{}}},"f:spec":{"f:replicas":{},"f:selector":{".":{},"f:app":{}},"f:strategy":{"f:activeDeadlineSeconds":{},"f:rollingParams":{".":{},"f:intervalSeconds":{},"f:maxSurge":{},"f:maxUnavailable":{},"f:timeoutSeconds":{},"f:updatePeriodSeconds":{}},"f:type":{}},"f:template":{".":{},"f:metadata":{".":{},"f:creationTimestamp":{},"f:labels":{".":{},"f:app":{}}},"f:spec":{".":{},"f:containers":{".":{},"k:{\"name\":\"example-dc-no-service\"}":{".":{},"f:image":{},"f:imagePullPolicy":{},"f:name":{},"f:ports":{".":{},"k:{\"containerPort\":8009,\"protocol\":\"TCP\"}":{".":{},"f:containerPort":{},"f:name":{},"f:protocol":{}},"k:{\"containerPort\":8080,\"protocol\":\"TCP\"}":{".":{},"f:containerPort":{},"f:name":{},"f:protocol":{}}},"f:resources":{},"f:terminationMessagePath":{},"f:terminationMessagePolicy":{}}},"f:dnsPolicy":{},"f:restartPolicy":{},"f:schedulerName":{},"f:securityContext":{},"f:terminationGracePeriodSeconds":{}}},"f:triggers":{}}}},{"manager":"openshift-controller-manager","operation":"Update","apiVersion":"apps.openshift.io/v1","time":"2022-08-22T17:30:09Z","fieldsType":"FieldsV1","fieldsV1":{"f:status":{"f:details":{".":{},"f:causes":{},"f:message":{}},"f:latestVersion":{}}},"subresource":"status"}]},"spec":{"strategy":{"type":"Rolling","rollingParams":{"updatePeriodSeconds":1,"intervalSeconds":1,"timeoutSeconds":600,"maxUnavailable":"25%","maxSurge":"25%"},"resources":{},"activeDeadlineSeconds":21600},"triggers":[{"type":"ConfigChange"}],"replicas":1,"revisionHistoryLimit":10,"test":false,"selector":{"app":"example-dc-no-service"},"template":{"metadata":{"creationTimestamp":null,"labels":{"app":"example-dc-no-service"}},"spec":{"containers":[{"name":"example-dc-no-service","image":"docker.io/namespace/bananas:latest","ports":[{"name":"http","containerPort":8080,"protocol":"TCP"},{"name":"another-http","containerPort":8009,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","imagePullPolicy":"Always"}],"restartPolicy":"Always","terminationGracePeriodSeconds":30,"dnsPolicy":"ClusterFirst","securityContext":{},"schedulerName":"default-scheduler"}}},"status":{"latestVersion":1,"observedGeneration":0,"replicas":0,"updatedReplicas":0,"availableReplicas":0,"unavailableReplicas":0,"details":{"message":"config
change","causes":[{"type":"ConfigChange"}]}}}
openshift.io/deployer-pod.name: example-dc-no-service-1-deploy
resourceVersion: '1127455589'
Expand Down Expand Up @@ -64,7 +64,7 @@ spec:
spec:
containers:
- name: example-dc-no-service
image: 'quay.io/kiegroup/process-quarkus-example:latest'
image: 'docker.io/namespace/bananas:latest'
ports:
- name: http
containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ metadata:
spec:
containers:
- name: pod-no-service-custom-port
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
imagePullPolicy: Never
ports:
- name: http
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ metadata:
spec:
containers:
- name: process-quarkus-example-pod-no-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
imagePullPolicy: Never
ports:
- name: http
Expand Down Expand Up @@ -64,5 +64,5 @@ status:
lastState: {}
ready: true
restartCount: 0
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
started: true
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: process-quarkus-example-statefulset-no-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
ports:
- containerPort: 8080
name: http
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
defaultMode: 420
containers:
- name: example-statefulset-without-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
ports:
- name: http
containerPort: 8080
Expand Down Expand Up @@ -126,6 +126,6 @@ status:
lastState: {}
ready: true
restartCount: 0
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
started: true
qosClass: BestEffort
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: example-statefulset-with-service
image: quay.io/kiegroup/process-quarkus-example:latest
image: docker.io/namespace/bananas:latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# under the License.
#

quarkus.kogito.dev-services-trusty.image-name=quay.io/kiegroup/kogito-trusty-postgresql:${version.org.kie.kogito.trusty-service-postgresql}
quarkus.kogito.dev-services-trusty.image-name=docker.io/apache/incubator-kie-kogito-trusty-postgresql:${version.org.kie.kogito.trusty-service-postgresql}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ mp.messaging.outgoing.kogito-tracing-model.topic=kogito-tracing-model
mp.messaging.outgoing.kogito-tracing-model.value.serializer=org.apache.kafka.common.serialization.StringSerializer
mp.messaging.outgoing.kogito-tracing-model.auto.offset.reset=earliest

quarkus.kogito.dev-services-trusty.image-name=quay.io/kiegroup/kogito-trusty-postgresql:latest
quarkus.kogito.dev-services-trusty.image-name=docker.io/apache/incubator-kie-kogito-trusty-postgresql:latest
#quarkus.kogito.dev-services-trusty.image-name=org.kie.kogito/trusty-service-postgresql:2.0.0-SNAPSHOT
quarkus.kogito.dev-services-trusty.port-used-by-test=-1
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<name>Kogito :: Quarkus Workflow Extension Common :: Deployment</name>

<properties>
<data-index-ephemeral.image>quay.io/kiegroup/kogito-data-index-ephemeral-nightly:latest</data-index-ephemeral.image>
<data-index-ephemeral.image>docker.io/apache/incubator-kie-kogito-data-index-ephemeral:main</data-index-ephemeral.image>
<java.module.name>org.kie.kogito.quarkus.workflow.deployment</java.module.name>
</properties>

Expand Down

0 comments on commit 030a82a

Please sign in to comment.