Skip to content

Commit 982e48e

Browse files
authored
Merge pull request #79 from apache/offline-images
2 parents c562668 + 250ed6e commit 982e48e

10 files changed

Lines changed: 29 additions & 29 deletions

File tree

deploy/acme-openshift/acme-setup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
containers:
5353
- name: openshift-acme
5454
image: quay.io/tnozicka/openshift-acme:controller
55-
imagePullPolicy: Always
55+
imagePullPolicy: IfNotPresent
5656
args:
5757
- --exposer-image=quay.io/tnozicka/openshift-acme:exposer
5858
- --loglevel=4

deploy/kafka/kafka-001-sts.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ spec:
4444
claimName: "kafka-pvc-data"
4545
initContainers:
4646
- name: "wait-for-zookeeper"
47-
image: "busybox:latest"
47+
image: "busybox:1.36.1"
4848
imagePullPolicy: "IfNotPresent"
4949
command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 zookeeper-0.zookeeper 2181); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi; done; echo "Success: zookeeper is up"']
50-
50+
5151
containers:
5252
- name: kafka
5353
image: "ghcr.io/nuvolaris/kafka:2.3.1.2311011621"
@@ -67,9 +67,9 @@ spec:
6767
- name: "KAFKA_ADVERTISED_LISTENERS"
6868
value: "EXTERNAL://_{HOSTNAME_COMMAND}:9092"
6969
- name: "KAFKA_INTER_BROKER_LISTENER_NAME"
70-
value: "EXTERNAL"
70+
value: "EXTERNAL"
7171
- name: "KAFKA_ZOOKEEPER_CONNECT"
72-
value: "zookeeper-0.zookeeper:2181"
72+
value: "zookeeper-0.zookeeper:2181"
7373
volumeMounts:
7474
- mountPath: /kafka
7575
name: "kafka-pvc"
@@ -104,4 +104,4 @@ spec:
104104
volumeMounts:
105105
- mountPath: /kafka
106106
name: kafka-pvc
107-
readOnly: true
107+
readOnly: true

deploy/mongodb-operator/mongodb-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
- name: MONGODB_REPO_URL
7474
value: docker.io
7575
image: quay.io/mongodb/mongodb-kubernetes-operator:0.7.8
76-
imagePullPolicy: Always
76+
imagePullPolicy: IfNotPresent
7777
name: mongodb-kubernetes-operator
7878
resources:
7979
limits:

deploy/openwhisk-standalone/standalone-conf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
apiVersion: v1
2727
kind: Pod
2828
spec:
29-
imagePullPolicy: Always
29+
imagePullPolicy: IfNotPresent
3030
imagePullSecrets:
3131
- name: registry-pull-secret
3232

deploy/quota/quota_checker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
containers:
3333
- name: quota-checker
3434
image: registry.hub.docker.com/nuvolaris/nuvolaris-operator:1.3.0-mastrogpt.2405142002
35-
imagePullPolicy: Always
35+
imagePullPolicy: IfNotPresent
3636
command:
3737
- /bin/sh
3838
- -c
@@ -48,6 +48,6 @@ spec:
4848
- name: DATABASE_DB_HOST_NAME
4949
value: nuvolaris-postgres
5050
- name: REDIS_PASSWORD
51-
value: RedisS0meP@ass3
52-
restartPolicy: OnFailure
51+
value: RedisS0meP@ass3
52+
restartPolicy: OnFailure
5353

deploy/redis/redis-set.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ spec:
3232
name: redis
3333
app: redis
3434
annotations:
35-
whisks.nuvolaris.org/annotate-version: "true"
35+
whisks.nuvolaris.org/annotate-version: "true"
3636
spec:
37-
restartPolicy: Always
37+
restartPolicy: Always
3838
containers:
3939
- name: redis
40-
image: bitnamisecure/valkey:latest
40+
image: docker.io/bitnamilegacy/redis:8.2.1
4141
command: ["/bin/sh","-c","redis-server /redis-master/redis.conf"]
4242
env:
4343
- name: MASTER

nuvolaris/templates/couchdb-init.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
containers:
4242
- name: init-couchdb
4343
image: "{{image}}"
44-
#imagePullPolicy: "Always"
44+
imagePullPolicy: "IfNotPresent"
4545
command: ["./dbinit.sh"]
4646
env:
4747
- name: "NUVOLARIS_CONFIG"

nuvolaris/templates/couchdb-set-tpl.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
namespace: nuvolaris
2323
name: {{name}}
2424
labels:
25-
name: {{name}}
25+
name: {{name}}
2626
app: {{appName}}
2727
index: "{{index}}"
2828
replicationRole: "{{replicationRole}}"
@@ -39,10 +39,10 @@ spec:
3939
labels:
4040
name: {{name}}
4141
app: {{appName}}
42-
index: "{{index}}"
42+
index: "{{index}}"
4343
replicationRole: primary
4444
annotations:
45-
whisks.nuvolaris.org/annotate-version: "true"
45+
whisks.nuvolaris.org/annotate-version: "true"
4646
spec:
4747
restartPolicy: Always
4848
containers:
@@ -53,7 +53,7 @@ spec:
5353
capabilities:
5454
drop:
5555
- ALL
56-
imagePullPolicy: "Always"
56+
imagePullPolicy: "IfNotPresent"
5757
{% else %}
5858
imagePullPolicy: "IfNotPresent"
5959
{% endif %}

nuvolaris/templates/kafka-001-sts.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
name: kafka
3737
app: kafka
3838
annotations:
39-
whisks.nuvolaris.org/annotate-version: "true"
39+
whisks.nuvolaris.org/annotate-version: "true"
4040
spec:
4141
restartPolicy: Always
4242
volumes:
@@ -46,10 +46,10 @@ spec:
4646

4747
initContainers:
4848
- name: "wait-for-zookeeper"
49-
image: "busybox:latest"
49+
image: "busybox:1.36.1"
5050
imagePullPolicy: "IfNotPresent"
5151
command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{zookeeper_host}} {{zookeeper_port}}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi; done; echo "Success: zookeeper is up"']
52-
52+
5353
containers:
5454
- name: kafka
5555
image: "ghcr.io/nuvolaris/kafka:2.3.1.2311011621"
@@ -69,9 +69,9 @@ spec:
6969
- name: "KAFKA_ADVERTISED_LISTENERS"
7070
value: "EXTERNAL://_{HOSTNAME_COMMAND}:9092"
7171
- name: "KAFKA_INTER_BROKER_LISTENER_NAME"
72-
value: "EXTERNAL"
72+
value: "EXTERNAL"
7373
- name: "KAFKA_ZOOKEEPER_CONNECT"
74-
value: "{{zookeeper_url}}"
74+
value: "{{zookeeper_url}}"
7575
volumeMounts:
7676
- mountPath: /kafka
7777
name: "kafka-pvc"
@@ -106,4 +106,4 @@ spec:
106106
volumeMounts:
107107
- mountPath: /kafka
108108
name: "kafka-pvc"
109-
readOnly: true
109+
readOnly: true

nuvolaris/templates/redis-set.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ spec:
3232
name: redis
3333
app: redis
3434
annotations:
35-
whisks.nuvolaris.org/annotate-version: "true"
35+
whisks.nuvolaris.org/annotate-version: "true"
3636
spec:
3737
restartPolicy: Always
3838
{% if applypodsecurity %}
3939
securityContext:
40-
fsGroup: 1001
41-
runAsUser: 1001 #default BITNAMI user
40+
fsGroup: 1001
41+
runAsUser: 1001 #default BITNAMI user
4242
{% endif %}
4343
containers:
4444
- name: redis
45-
image: bitnamisecure/valkey:latest
45+
image: docker.io/bitnamilegacy/redis:8.2.1
4646
command: ["/bin/sh","-c","redis-server /redis-master/redis.conf"]
4747
env:
4848
- name: MASTER

0 commit comments

Comments
 (0)