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.

Sign up for GitHub

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

Jump to bottom

Use fully qualified domain image names by default (docker.io) #690

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use fully qualified domain image names by default (docker.io) #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions cli/k8s_client/yaml_factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ func TestValidateGetCSIDeploymentYAMLSuccess(t *testing.T) {

deploymentArgs := &DeploymentYAMLArguments{
DeploymentName: "trident-csi",
TridentImage: "netapp/trident:20.10.0-custom",
AutosupportImage: "netapp/trident-autosupport:20.10.0-custom",
TridentImage: "docker.io/netapp/trident:20.10.0-custom",
AutosupportImage: "docker.io/netapp/trident-autosupport:20.10.0-custom",
AutosupportSerialNumber: "0000-0000",
AutosupportHostname: "21e160d3-721f-4ec4-bcd4-c5e0d31d1a6e",
AutosupportProxy: "http://127.0.0.1/",
Expand Down Expand Up @@ -179,8 +179,8 @@ func TestValidateGetCSIDeploymentYAMLFail(t *testing.T) {

deploymentArgs := &DeploymentYAMLArguments{
DeploymentName: "\ntrident-csi",
TridentImage: "netapp/trident:20.10.0-custom",
AutosupportImage: "netapp/trident-autosupport:20.10.0-custom",
TridentImage: "docker.io/netapp/trident:20.10.0-custom",
AutosupportImage: "docker.io/netapp/trident-autosupport:20.10.0-custom",
AutosupportProxy: "http://127.0.0.1/",
AutosupportCustomURL: "http://172.16.150.125:8888/",
AutosupportSerialNumber: "0000-0000",
Expand Down
5 changes: 3 additions & 2 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ const (
MinTLSVersion = tls.VersionTLS12

/* Docker constants */
ImageRegistry = "docker.io"
DockerPluginModeEnvVariable = "DOCKER_PLUGIN_MODE" // set via contrib/docker/plugin/plugin.json
DockerPluginConfigLocation = "/etc/netappdvp"

Expand All @@ -134,7 +135,7 @@ const (
/* Kubernetes operator constants */
OperatorContainerName = "trident-operator"

DefaultAutosupportImage = "netapp/trident-autosupport:21.10"
DefaultAutosupportImage = ImageRegistry + "/netapp/trident-autosupport:21.10"
)

var (
Expand All @@ -157,7 +158,7 @@ var (
BuildTime = "unknown"

// BuildImage is the Trident image that was built
BuildImage = "netapp/trident:" + DefaultOrchestratorVersion + "-custom.0"
BuildImage = ImageRegistry + "/netapp/trident:" + DefaultOrchestratorVersion + "-custom.0"

OrchestratorVersion = utils.MustParseDate(version())

Expand Down
2 changes: 1 addition & 1 deletion deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: trident-operator
image: netapp/trident-operator:22.01.0
image: docker.io/netapp/trident-operator:22.01.0
imagePullPolicy: IfNotPresent
name: trident-operator
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion deploy/crds/tridentorchestrator_cr_autosupport.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ spec:
debug: true
namespace: trident
silenceAutosupport: false
autosupportImage: "netapp/trident-autosupport:21.10"
autosupportImage: "docker.io/netapp/trident-autosupport:21.10"
autosupportProxy: "http://proxy.example.com:8888"
2 changes: 1 addition & 1 deletion deploy/crds/tridentorchestrator_cr_imagepullsecrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
spec:
debug: true
namespace: trident
tridentImage: netapp/trident:22.01.0
tridentImage: docker.io/netapp/trident:22.01.0
imagePullSecrets:
- thisisasecret
2 changes: 1 addition & 1 deletion deploy/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
serviceAccountName: trident-operator
containers:
- name: trident-operator
image: netapp/trident-operator:22.01.0
image: docker.io/netapp/trident-operator:22.01.0
command:
- "/trident-operator"
- "--debug"
Expand Down
2 changes: 1 addition & 1 deletion docs/docker/deploying.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Deploying

.. code-block:: bash

docker plugin install netapp/trident-plugin:21.07 --alias netapp --grant-all-permissions
docker plugin install docker.io/netapp/trident-plugin:21.07 --alias netapp --grant-all-permissions

#. Begin using Trident to consume storage from the configured system.

Expand Down
2 changes: 1 addition & 1 deletion docs/docker/install/host_config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ Docker Managed Plugin Method (Docker >= 1.13 / 17.03)

.. code-block:: bash

docker plugin install --grant-all-permissions --alias netapp netapp/trident-plugin:21.07 config=myConfigFile.json
docker plugin install --grant-all-permissions --alias docker.io/netapp netapp/trident-plugin:21.07 config=myConfigFile.json

#. Begin using Trident to consume storage from the configured system.

Expand Down
4 changes: 2 additions & 2 deletions docs/docker/install/multi_instance.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ containerized plugin, or ``--volume-driver`` option when instantiating Trident o

.. code-block:: bash

docker plugin install --grant-all-permissions --alias silver netapp/trident-plugin:21.07 config=silver.json
docker plugin install --grant-all-permissions --alias silver docker.io/netapp/trident-plugin:21.07 config=silver.json

#. Launch the second instance, specifying a different alias and configuration file

.. code-block:: bash

docker plugin install --grant-all-permissions --alias gold netapp/trident-plugin:21.07 config=gold.json
docker plugin install --grant-all-permissions --alias gold docker.io/netapp/trident-plugin:21.07 config=gold.json

#. Create volumes specifying the alias as the driver name

Expand Down
2 changes: 1 addition & 1 deletion docs/docker/troubleshooting.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ find that's not enough, you can enable debug logging:
.. code-block:: bash

# install the plugin with debug logging enabled
docker plugin install netapp/trident-plugin:<version> --alias <alias> debug=true
docker plugin install docker.io/netapp/trident-plugin:<version> --alias <alias> debug=true

# or, enable debug logging when the plugin is already installed
docker plugin disable <plugin>
Expand Down
2 changes: 1 addition & 1 deletion docs/docker/use/managing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ again. Under most circumstances, this is a matter of seconds.

.. code-block:: bash

docker plugin upgrade --skip-remote-check --grant-all-permissions netapp:latest netapp/trident-plugin:21.07
docker plugin upgrade --skip-remote-check --grant-all-permissions netapp:latest docker.io/netapp/trident-plugin:21.07

.. note::

Expand Down
10 changes: 5 additions & 5 deletions docs/kubernetes/deploying/operator-deploy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ installation in the ``trident`` namespace.
Current Installation Params:
IPv6: false
Autosupport Hostname:
Autosupport Image: netapp/trident-autosupport:21.01
Autosupport Image: docker.io/netapp/trident-autosupport:21.01
Autosupport Proxy:
Autosupport Serial Number:
Debug: true
Expand All @@ -237,7 +237,7 @@ installation in the ``trident`` namespace.
Kubelet Dir: /var/lib/kubelet
Log Format: text
Silence Autosupport: false
Trident Image: netapp/trident:21.07.0
Trident Image: docker.io/netapp/trident:21.07.0
Message: Trident installed
Namespace: trident
Status: Installed
Expand Down Expand Up @@ -265,11 +265,11 @@ useIPv6 Install Trident over IPv6
k8sTimeout Timeout for Kubernetes operations 30sec
silenceAutosupport Don't send autosupport bundles to NetApp automatically 'false'
enableNodePrep Manage worker node dependencies automatically (**BETA**) 'false'
autosupportImage The container image for Autosupport Telemetry "netapp/trident-autosupport:21.01.0"
autosupportImage The container image for Autosupport Telemetry "docker.io/netapp/trident-autosupport:21.01.0"
autosupportProxy The address/port of a proxy for sending Autosupport Telemetry "http://proxy.example.com:8888"
uninstall A flag used to uninstall Trident 'false'
logFormat Trident logging format to be used [text,json] "text"
tridentImage Trident image to install "netapp/trident:21.07"
tridentImage Trident image to install "docker.io/netapp/trident:21.07"
imageRegistry Path to internal registry, of the format ``<registry FQDN>[:port][/subpath]`` "k8s.gcr.io/sig-storage"
kubeletDir Path to the kubelet directory on the host "/var/lib/kubelet"
wipeout A list of resources to delete to perform a complete removal of Trident
Expand Down Expand Up @@ -302,7 +302,7 @@ customize your Trident installation. Here's an example:
spec:
debug: true
namespace: trident
tridentImage: netapp/trident:21.07.0
tridentImage: docker.io/netapp/trident:21.07.0
imagePullSecrets:
- thisisasecret

Expand Down
4 changes: 2 additions & 2 deletions docs/kubernetes/upgrades/downgrading.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ If you are unsure as to how Trident is installed, here is a simple test to run:
$ kubectl describe pod trident-csi-79df798bdc-2jzpq -n trident | grep "Image" -A 2 -B 2 | head -4
trident-main:
Container ID: docker://e088b1ffc7017ddba8144d334cbc1eb646bf3491be031ef583a3f189ed965213
Image: netapp/trident:21.07.0
Image ID: docker-pullable://netapp/trident@sha256:28095a20d8cfffaaaaakkkkkeeeeeec4925ac5d652341b6eaa2ea9352f1e0
Image: docker.io/netapp/trident:21.07.0
Image ID: docker-pullable://docker.io/netapp/trident@sha256:28095a20d8cfffaaaaakkkkkeeeeeec4925ac5d652341b6eaa2ea9352f1e0

#Is the version of Trident being used >=21.01? If yes, check if a ``tridentorchestrator`` is present.
#If yes, then you have installed Trident using the operator.
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/tridentctl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Install Trident
tridentctl install [flags]

Flags:
--autosupport-image string The container image for Autosupport Telemetry (default "netapp/trident-autosupport:20.07.0")
--autosupport-image string The container image for Autosupport Telemetry (default "docker.io/netapp/trident-autosupport:20.07.0")
--autosupport-proxy string The address/port of a proxy for sending Autosupport Telemetry
--csi Install CSI Trident (override for Kubernetes 1.13 only, requires feature gates).
--enable-node-prep Attempt to install required packages on nodes.
Expand Down
36 changes: 18 additions & 18 deletions docs/support/requirements.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ Trident:
+------------------------+-------------------------------------------------------------+
| KUBERNETES VERSION | CONTAINER IMAGE |
+========================+=============================================================+
| v1.17.0 | netapp/trident:21.07.0 |
| v1.17.0 | docker.io/netapp/trident:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-operator:21.07.0 |
| | docker.io/netapp/trident-operator:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-autosupport:21.01 |
| | docker.io/netapp/trident-autosupport:21.01 |
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1 |
+------------------------+-------------------------------------------------------------+
Expand All @@ -112,11 +112,11 @@ Trident:
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 |
+------------------------+-------------------------------------------------------------+
| v1.18.0 | netapp/trident:21.07.0 |
| v1.18.0 | docker.io/netapp/trident:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-operator:21.07.0 |
| | docker.io/netapp/trident-operator:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-autosupport:21.01 |
| | docker.io/netapp/trident-autosupport:21.01 |
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1 |
+------------------------+-------------------------------------------------------------+
Expand All @@ -128,11 +128,11 @@ Trident:
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 |
+------------------------+-------------------------------------------------------------+
| v1.19.0 | netapp/trident:21.07.0 |
| v1.19.0 | docker.io/netapp/trident:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-operator:21.07.0 |
| | docker.io/netapp/trident-operator:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-autosupport:21.01 |
| | docker.io/netapp/trident-autosupport:21.01 |
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1 |
+------------------------+-------------------------------------------------------------+
Expand All @@ -144,11 +144,11 @@ Trident:
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 |
+------------------------+-------------------------------------------------------------+
| v1.20.0 | netapp/trident:21.07.0 |
| v1.20.0 | docker.io/netapp/trident:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-operator:21.07.0 |
| | docker.io/netapp/trident-operator:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-autosupport:21.01 |
| | docker.io/netapp/trident-autosupport:21.01 |
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1 |
+------------------------+-------------------------------------------------------------+
Expand All @@ -160,11 +160,11 @@ Trident:
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 |
+------------------------+-------------------------------------------------------------+
| v1.21.0 | netapp/trident:21.07.0 |
| v1.21.0 | docker.io/netapp/trident:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-operator:21.07.0 |
| | docker.io/netapp/trident-operator:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-autosupport:21.01 |
| | docker.io/netapp/trident-autosupport:21.01 |
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1 |
+------------------------+-------------------------------------------------------------+
Expand All @@ -176,11 +176,11 @@ Trident:
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 |
+------------------------+-------------------------------------------------------------+
| v1.22.0 | netapp/trident:21.07.0 |
| v1.22.0 | docker.io/netapp/trident:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-operator:21.07.0 |
| | docker.io/netapp/trident-operator:21.07.0 |
+------------------------+-------------------------------------------------------------+
| | netapp/trident-autosupport:21.01 |
| | docker.io/netapp/trident-autosupport:21.01 |
+------------------------+-------------------------------------------------------------+
| | k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1 |
+------------------------+-------------------------------------------------------------+
Expand Down
6 changes: 3 additions & 3 deletions helm/trident-operator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Trident operator image
{{- else if .Values.imageRegistry }}
{{- .Values.imageRegistry }}/trident-operator:{{ .Values.operatorImageTag | default .Chart.AppVersion }}
{{- else }}
{{- "" }}netapp/trident-operator:{{ .Values.operatorImageTag | default .Chart.AppVersion }}
{{- "" }}docker.io/netapp/trident-operator:{{ .Values.operatorImageTag | default .Chart.AppVersion }}
{{- end }}
{{- end }}

Expand Down Expand Up @@ -116,7 +116,7 @@ Trident AutoSupport image
{{- else if .Values.imageRegistry }}
{{- .Values.imageRegistry }}/trident-autosupport:{{ .Values.tridentAutosupportImageTag | default .Chart.AppVersion | trunc 5}}
{{- else }}
{{- "" }}netapp/trident-autosupport:{{ .Values.tridentAutosupportImageTag | default .Chart.AppVersion | trunc 5}}
{{- "" }}docker.io/netapp/trident-autosupport:{{ .Values.tridentAutosupportImageTag | default .Chart.AppVersion | trunc 5}}
{{- end }}
{{- end }}

Expand Down Expand Up @@ -151,7 +151,7 @@ Trident image
{{- else if .Values.imageRegistry }}
{{- .Values.imageRegistry }}/trident:{{ .Values.tridentImageTag | default .Chart.AppVersion }}
{{- else }}
{{- "" }}netapp/trident:{{ .Values.tridentImageTag | default .Chart.AppVersion }}
{{- "" }}docker.io/netapp/trident:{{ .Values.tridentImageTag | default .Chart.AppVersion }}
{{- end }}
{{- end }}

Expand Down
2 changes: 1 addition & 1 deletion operator/controllers/orchestrator/installer/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
var (
DefaultTridentVersion = config.DefaultOrchestratorVersion

DefaultTridentRepo = "netapp/trident:" // Default repo from where to pull Trident Image
DefaultTridentRepo = "docker.io/netapp/trident:" // Default repo from where to pull Trident Image

// TridentImage is the image that the operator installs by default
TridentImage = DefaultTridentRepo + DefaultTridentVersion
Expand Down