diff --git a/services/image-registry/image-registry-cd-test-cluster.kind.yaml b/dev/test-cluster.kind.yaml similarity index 61% rename from services/image-registry/image-registry-cd-test-cluster.kind.yaml rename to dev/test-cluster.kind.yaml index 35d6604..5329363 100644 --- a/services/image-registry/image-registry-cd-test-cluster.kind.yaml +++ b/dev/test-cluster.kind.yaml @@ -1,10 +1,14 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 -name: sinf2023-minicluster +name: niployments-test-cluster nodes: - role: control-plane + - role: control-plane + - role: control-plane + - role: worker + - role: worker containerdConfigPatches: - |- - [plugins."io.containerd.grpc.v1.cri".registry.configs."172.18.255.200".tls] + [plugins."io.containerd.grpc.v1.cri".registry.configs."172.18.255.200:443".tls] insecure_skip_verify = true diff --git a/services/image-registry/deploy.sh b/services/image-registry/deploy-dev.sh similarity index 66% rename from services/image-registry/deploy.sh rename to services/image-registry/deploy-dev.sh index fbeb9ea..372c706 100755 --- a/services/image-registry/deploy.sh +++ b/services/image-registry/deploy-dev.sh @@ -6,7 +6,7 @@ helm repo update kubectl apply -f $(dirname $0)/00-harbor-namespace.yaml helm upgrade --install harbor harbor/harbor \ --namespace image-registry \ - --values $(dirname $0)/harbor-local-values.yaml + --values $(dirname $0)/harbor-dev-values.yaml -kubectl apply -f $(dirname $0)/keel-local-deployment.yaml +kubectl apply -f $(dirname $0)/keel-dev-deployment.yaml diff --git a/services/image-registry/example-deployment.yaml b/services/image-registry/example-deployment.yaml index 6c9b32f..2ccd233 100644 --- a/services/image-registry/example-deployment.yaml +++ b/services/image-registry/example-deployment.yaml @@ -8,6 +8,7 @@ metadata: # force policy will ensure that deployment is updated # even when tag is unchanged (latest remains) keel.sh/policy: major + ignore-check.kube-linter.io/run-as-non-root: "This deployment needs to run as root" spec: replicas: 1 revisionHistoryLimit: 5 @@ -28,7 +29,6 @@ spec: args: [ "while true; do sleep 3600; done;" ] securityContext: readOnlyRootFilesystem: true - runAsNonRoot: true resources: limits: cpu: 50m diff --git a/services/image-registry/harbor-local-values.yaml b/services/image-registry/harbor-dev-values.yaml similarity index 100% rename from services/image-registry/harbor-local-values.yaml rename to services/image-registry/harbor-dev-values.yaml diff --git a/services/image-registry/keel-local-deployment.yaml b/services/image-registry/keel-dev-deployment.yaml similarity index 98% rename from services/image-registry/keel-local-deployment.yaml rename to services/image-registry/keel-dev-deployment.yaml index 34bc6f7..7cafece 100644 --- a/services/image-registry/keel-local-deployment.yaml +++ b/services/image-registry/keel-dev-deployment.yaml @@ -109,6 +109,8 @@ metadata: namespace: keel labels: app: keel + annotations: + ignore-check.kube-linter.io/run-as-non-root: "This deployment needs to run as root" spec: replicas: 1 selector: @@ -147,7 +149,6 @@ spec: command: ["/bin/keel"] securityContext: readOnlyRootFilesystem: true - runAsNonRoot: true env: - name: NAMESPACE valueFrom: